@hubspot/cli 7.2.0-experimental.0 → 7.2.2-experimental.0

package/commands/sandbox/delete.js

@@ -1,207 +1,190 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const index_1 = require("@hubspot/local-dev-lib/errors/index");
-const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const urls_1 = require("@hubspot/local-dev-lib/urls");
-const environment_1 = require("@hubspot/local-dev-lib/environment");
-const commonOpts_1 = require("../../lib/commonOpts");
-const usageTracking_1 = require("../../lib/usageTracking");
-const index_2 = require("../../lib/errorHandlers/index");
-const lang_1 = require("../../lib/lang");
-const sandboxesPrompt_1 = require("../../lib/prompts/sandboxesPrompt");
-const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const ui_1 = require("../../lib/ui");
+// @ts-nocheck
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { logError, debugError } = require('../../lib/errorHandlers/index');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
+const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
+const { i18n } = require('../../lib/lang');
+const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
+const { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
+const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { uiAccountDescription, uiBetaTag } = require('../../lib/ui');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const i18nKey = 'commands.sandbox.subcommands.delete';
 exports.command = 'delete';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
-async function handler(args) {
-    const { providedAccountId, force } = args;
-    (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
+exports.describe = exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.handler = async (options) => {
+    const { providedAccountId, force } = options;
+    trackCommandUsage('sandbox-delete', null);
     let accountPrompt;
     if (!providedAccountId) {
         if (!force) {
-            accountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)();
+            accountPrompt = await deleteSandboxPrompt();
         }
         else {
             // Account is required, throw error if force flag is present and no account is specified
-            logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccount`));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            logger.log('');
+            logger.error(i18n(`${i18nKey}.failure.noAccount`));
+            process.exit(EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
-            logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccounts`, {
-                authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-            }));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            logger.log('');
+            logger.error(i18n(`${i18nKey}.failure.noSandboxAccounts`));
+            process.exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
-    if (!sandboxAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountId`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    const isDefaultAccount = sandboxAccountId === (0, config_1.getAccountId)();
-    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, environment_1.getValidEnv)((0, config_1.getEnv)(sandboxAccountId)));
+    const sandboxAccountId = getAccountId(providedAccountId || accountPrompt.account);
+    const isDefaultAccount = sandboxAccountId === getAccountId();
+    const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
     let parentAccountId;
-    const accountsList = (0, config_1.getConfigAccounts)() || [];
+    const accountsList = getConfigAccounts();
     for (const portal of accountsList) {
-        if ((0, getAccountIdentifier_1.getAccountIdentifier)(portal) === sandboxAccountId) {
+        if (getAccountIdentifier(portal) === sandboxAccountId) {
             if (portal.parentAccountId) {
                 parentAccountId = portal.parentAccountId;
             }
             else if (!force) {
-                const parentAccountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)(true);
-                if (!parentAccountPrompt) {
-                    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
-                        authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-                    }));
-                    process.exit(exitCodes_1.EXIT_CODES.ERROR);
-                }
-                parentAccountId = (0, config_1.getAccountId)(parentAccountPrompt.account);
+                const parentAccountPrompt = await deleteSandboxPrompt(true);
+                parentAccountId = getAccountId(parentAccountPrompt.account);
             }
             else {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
-                    authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-                }));
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                logger.error(i18n(`${i18nKey}.failure.noParentAccount`));
+                process.exit(EXIT_CODES.ERROR);
             }
         }
     }
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
-    const command = `hs auth ${(0, config_1.getEnv)(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
-    if (parentAccountId && !(0, config_1.getAccountId)(parentAccountId)) {
-        logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentPortalAvailable`, {
+    const command = `hs auth ${getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
+    if (parentAccountId && !getAccountId(parentAccountId)) {
+        logger.log('');
+        logger.error(i18n(`${i18nKey}.failure.noParentPortalAvailable`, {
             parentAccountId,
             url,
             command,
         }));
-        logger_1.logger.log('');
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.log('');
+        process.exit(EXIT_CODES.ERROR);
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.deleting`, {
-        account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
+    logger.debug(i18n(`${i18nKey}.debug.deleting`, {
+        account: uiAccountDescription(sandboxAccountId),
     }));
     if (isDefaultAccount) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.defaultAccountWarning`, {
-            account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
+        logger.info(i18n(`${i18nKey}.defaultAccountWarning`, {
+            account: uiAccountDescription(sandboxAccountId),
         }));
-        logger_1.logger.log('');
+        logger.log('');
     }
     try {
         if (!force) {
-            const { confirmSandboxDeletePrompt: confirmed } = await (0, promptUtils_1.promptUser)([
+            const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: (0, lang_1.i18n)(`${i18nKey}.confirm`, {
-                        account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
+                    message: i18n(`${i18nKey}.confirm`, {
+                        account: uiAccountDescription(sandboxAccountId),
                     }),
                 },
             ]);
             if (!confirmed) {
-                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+                process.exit(EXIT_CODES.SUCCESS);
             }
         }
-        await (0, sandboxHubs_1.deleteSandbox)(parentAccountId, sandboxAccountId);
+        await deleteSandbox(parentAccountId, sandboxAccountId);
         const deleteKey = isDefaultAccount
             ? `${i18nKey}.success.deleteDefault`
             : `${i18nKey}.success.delete`;
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
+        logger.log('');
+        logger.success(i18n(deleteKey, {
             account: providedAccountId || accountPrompt.account,
-            sandboxHubId: sandboxAccountId || '',
+            sandboxHubId: sandboxAccountId,
         }));
-        logger_1.logger.log('');
-        const promptDefaultAccount = (0, config_1.removeSandboxAccountFromConfig)(sandboxAccountId);
+        logger.log('');
+        const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
         if (promptDefaultAccount && !force) {
-            const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-            (0, config_1.updateDefaultAccount)(newDefaultAccount);
+            const newDefaultAccount = await selectAccountFromConfig();
+            updateDefaultAccount(newDefaultAccount);
         }
         else {
             // If force is specified, skip prompt and set the parent account id as the default account
-            (0, config_1.updateDefaultAccount)(parentAccountId);
+            updateDefaultAccount(parentAccountId);
         }
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        process.exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
-        (0, index_2.debugError)(err);
-        if ((0, index_1.isSpecifiedError)(err, { statusCode: 401 })) {
+        debugError(err);
+        if (isSpecifiedError(err, { statusCode: 401 })) {
             // Intercept invalid key error
             // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
-            logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidKey`, {
-                account: (0, ui_1.uiAccountDescription)(parentAccountId),
-                authCommand: (0, ui_1.uiCommandReference)('hs auth'),
+            logger.log('');
+            logger.error(i18n(`${i18nKey}.failure.invalidKey`, {
+                account: uiAccountDescription(parentAccountId),
             }));
         }
-        else if ((0, index_1.isSpecifiedError)(err, {
+        else if (isSpecifiedError(err, {
             statusCode: 403,
             category: 'BANNED',
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
-            logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
-                accountName: (0, ui_1.uiAccountDescription)(sandboxAccountId),
-                parentAccountName: (0, ui_1.uiAccountDescription)(parentAccountId),
+            logger.log('');
+            logger.error(i18n(`${i18nKey}.failure.invalidUser`, {
+                accountName: uiAccountDescription(sandboxAccountId),
+                parentAccountName: uiAccountDescription(parentAccountId),
             }));
-            logger_1.logger.log('');
+            logger.log('');
         }
-        else if ((0, index_1.isSpecifiedError)(err, {
+        else if (isSpecifiedError(err, {
             statusCode: 404,
             category: 'OBJECT_NOT_FOUND',
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
-            logger_1.logger.log('');
-            logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.failure.objectNotFound`, {
-                account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
+            logger.log('');
+            logger.warn(i18n(`${i18nKey}.failure.objectNotFound`, {
+                account: uiAccountDescription(sandboxAccountId),
             }));
-            logger_1.logger.log('');
-            const promptDefaultAccount = (0, config_1.removeSandboxAccountFromConfig)(sandboxAccountId);
+            logger.log('');
+            const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
             if (promptDefaultAccount && !force) {
-                const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-                (0, config_1.updateDefaultAccount)(newDefaultAccount);
+                const newDefaultAccount = await selectAccountFromConfig();
+                updateDefaultAccount(newDefaultAccount);
             }
             else {
                 // If force is specified, skip prompt and set the parent account id as the default account
-                (0, config_1.updateDefaultAccount)(parentAccountId);
+                updateDefaultAccount(parentAccountId);
             }
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            process.exit(EXIT_CODES.SUCCESS);
         }
         else {
-            (0, index_2.logError)(err);
+            logError(err);
         }
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
-}
-function builder(yargs) {
+};
+exports.builder = yargs => {
     yargs.option('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: i18n(`${i18nKey}.options.force.describe`),
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            i18n(`${i18nKey}.examples.default`),
         ],
     ]);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    addTestingOptions(yargs);
     return yargs;
-}
+};

package/commands/sandbox.d.ts

@@ -1,4 +1 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string | undefined;
-export declare function builder(yargs: Argv): Argv;
+export {};

package/commands/sandbox.js

@@ -1,50 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.builder = builder;
-const commonOpts_1 = require("../lib/commonOpts");
-const lang_1 = require("../lib/lang");
-const ui_1 = require("../lib/ui");
-const create = __importStar(require("./sandbox/create"));
-const del = __importStar(require("./sandbox/delete"));
+// @ts-nocheck
+const { addGlobalOptions } = require('../lib/commonOpts');
+const { i18n } = require('../lib/lang');
+const { uiBetaTag } = require('../lib/ui');
+const create = require('./sandbox/create');
+const del = require('./sandbox/delete');
 const i18nKey = 'commands.sandbox';
 exports.command = ['sandbox', 'sandboxes'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.builder = yargs => {
+    addGlobalOptions(yargs);
     yargs.command(create).command(del).demandCommand(1, '');
     return yargs;
-}
+};

package/commands/theme/generate-selectors.d.ts

@@ -1,10 +1 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "generate-selectors <path>";
-export declare const describe: string;
-type ThemeSelectorArgs = CommonArgs & {
-    path: string;
-};
-export declare function handler(args: ArgumentsCamelCase<ThemeSelectorArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemeSelectorArgs>;
 export {};

package/commands/theme/generate-selectors.js

@@ -1,16 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const fs_1 = __importDefault(require("fs"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const lang_1 = require("../../lib/lang");
-const generateSelectors_1 = require("../../lib/generateSelectors");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
+// @ts-nocheck
+const fs = require('fs');
+const { i18n } = require('../../lib/lang');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } = require('../../lib/generateSelectors');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
 const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');
 const HUBL_STATEMENT_REGEX = new RegExp(/{{\s*[\w.(,\d\-\s)|/~]*.*}}/, 'g');
@@ -22,30 +17,28 @@ const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
 const i18nKey = 'commands.theme.subcommands.generateSelectors';
 exports.command = 'generate-selectors <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-async function handler(args) {
-    const { path } = args;
-    const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.handler = options => {
+    const { path } = options;
+    const fieldsJsonPath = findFieldsJsonPath(path);
     if (!fieldsJsonPath) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.fieldsNotFound`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.error(i18n(`${i18nKey}.errors.fieldsNotFound`));
+        process.exit(EXIT_CODES.ERROR);
     }
-    let fieldsJson = JSON.parse(fs_1.default.readFileSync(fieldsJsonPath, 'utf-8'));
-    let cssString = (0, generateSelectors_1.combineThemeCss)(path) ?? '';
+    let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath));
+    let cssString = combineThemeCss(path);
     /**
      * Creates map of HubL variable names to theme field paths
      */
-    const HubLExpressions = cssString.match(HUBL_EXPRESSION_REGEX);
-    const hublVariableMap = HubLExpressions
-        ? HubLExpressions.reduce((_hublVariableMap, expression) => {
-            const variableName = expression.match(HUBL_VARIABLE_NAME_REGEX);
-            const themeFieldKey = expression.match(THEME_PATH_REGEX);
-            if (!themeFieldKey || !variableName)
-                return _hublVariableMap;
-            _hublVariableMap[variableName[1]] = themeFieldKey[1];
+    const HubLExpressions = cssString.match(HUBL_EXPRESSION_REGEX) || [];
+    const hublVariableMap = HubLExpressions.reduce((_hublVariableMap, expression) => {
+        const variableName = expression.match(HUBL_VARIABLE_NAME_REGEX);
+        const themeFieldKey = expression.match(THEME_PATH_REGEX);
+        if (!themeFieldKey || !variableName)
             return _hublVariableMap;
-        }, {})
-        : {};
+        _hublVariableMap[variableName[1]] = themeFieldKey[1];
+        return _hublVariableMap;
+    }, {});
     /**
      * Removes HubL variable expressions
      */
@@ -89,37 +82,28 @@ async function handler(args) {
     const finalMap = cssExpressions.reduce((themeFieldsSelectorMap, cssExpression) => {
         const hublStatementsPlaceholderKey = cssExpression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX) || [];
         hublStatementsPlaceholderKey.forEach(placeholderKey => {
-            let hublStatement;
-            let themeFieldPath;
-            if (placeholderKey in hublStatementsMap) {
-                hublStatement =
-                    hublStatementsMap[placeholderKey].match(HUBL_EXPRESSIONS);
-                themeFieldPath =
-                    hublStatementsMap[placeholderKey].match(/theme\.[\w|.]*/);
-            }
+            const hublStatement = hublStatementsMap[placeholderKey].match(HUBL_EXPRESSIONS);
+            const themeFieldPath = hublStatementsMap[placeholderKey].match(/theme\.[\w|.]*/, 'g');
             const cssSelectors = cssExpression.match(CSS_SELECTORS_REGEX);
             /**
              * Try to match a HubL statement to any HubL Variables being used
              */
             if (cssSelectors && themeFieldPath) {
                 const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
-                const hublThemePath = themeFieldPath?.[0] ?? '';
+                const hublThemePath = themeFieldPath[0];
                 if (!themeFieldsSelectorMap[hublThemePath]) {
                     themeFieldsSelectorMap[hublThemePath] = [];
                 }
                 if (!themeFieldsSelectorMap[hublThemePath].includes(cssSelector)) {
-                    themeFieldsSelectorMap[hublThemePath] =
-                        themeFieldsSelectorMap[hublThemePath].concat(cssSelector);
+                    themeFieldsSelectorMap[hublThemePath] = themeFieldsSelectorMap[hublThemePath].concat(cssSelector);
                 }
             }
             if (cssSelectors && hublStatement) {
-                const cssSelector = cssSelectors?.[1]?.replace(/\n/g, ' ') ?? '';
+                const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
                 const hublVariableName = Object.keys(hublVariableMap).find(_hubl => {
-                    return hublStatement && hublStatement[0].includes(_hubl);
-                }) || '';
-                const themeFieldKey = hublVariableName
-                    ? hublVariableMap[hublVariableName]
-                    : undefined;
+                    return hublStatement[0].includes(_hubl);
+                });
+                const themeFieldKey = hublVariableMap[hublVariableName];
                 /**
                  * If the theme path is referenced directly add selectors
                  */
@@ -128,8 +112,7 @@ async function handler(args) {
                         themeFieldsSelectorMap[themeFieldKey] = [];
                     }
                     if (!themeFieldsSelectorMap[themeFieldKey].includes(cssSelector)) {
-                        themeFieldsSelectorMap[themeFieldKey] =
-                            themeFieldsSelectorMap[themeFieldKey].concat(cssSelector);
+                        themeFieldsSelectorMap[themeFieldKey] = themeFieldsSelectorMap[themeFieldKey].concat(cssSelector);
                     }
                 }
             }
@@ -137,33 +120,32 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSelectorsFound`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.error(i18n(`${i18nKey}.errors.noSelectorsFound`));
+        process.exit(EXIT_CODES.ERROR);
     }
     Object.keys(finalMap).forEach(themeFieldKey => {
         const fieldKey = themeFieldKey.split('.');
         const selectors = finalMap[themeFieldKey];
-        fieldsJson = (0, generateSelectors_1.setPreviewSelectors)(fieldsJson, fieldKey.splice(1), selectors);
+        fieldsJson = setPreviewSelectors(fieldsJson, fieldKey.splice(1), selectors);
     });
     // Because fields can have nested inheritance we generated inherited selectors
     // multiple times to make sure all inherted selectors are bubbled up.
-    const maxFieldsDepth = (0, generateSelectors_1.getMaxFieldsDepth)();
+    const maxFieldsDepth = getMaxFieldsDepth();
     for (let i = 0; i < maxFieldsDepth; i += 1) {
-        fieldsJson = (0, generateSelectors_1.generateInheritedSelectors)(fieldsJson);
+        fieldsJson = generateInheritedSelectors(fieldsJson, fieldsJson);
     }
-    const selectorsMap = (0, generateSelectors_1.generateSelectorsMap)(fieldsJson);
+    const selectorsMap = generateSelectorsMap(fieldsJson);
     const selectorsPath = `${path}/editor-preview.json`;
-    fs_1.default.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, {
+    fs.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
+    logger.success(i18n(`${i18nKey}.success`, {
         themePath: path,
         selectorsPath,
     }));
-}
-function builder(yargs) {
+};
+exports.builder = yargs => {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',
-        required: true,
     });
     return yargs;
-}
+};

package/commands/theme/marketplace-validate.d.ts

@@ -1,11 +1 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "marketplace-validate <path>";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type ThemeValidateArgs = CombinedArgs & {
-    path: string;
-};
-export declare function handler(args: ArgumentsCamelCase<ThemeValidateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemeValidateArgs>;
 export {};