@hubspot/cli 7.5.4-experimental.0 → 7.5.4

package/commands/secret/deleteSecret.js

@@ -1,8 +1,5 @@
 "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 secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
@@ -11,11 +8,10 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.delete';
-exports.command = 'delete [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'delete [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.delete.describe`);
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -23,30 +19,34 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSecret`, { secretName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.noSecret`, {
+                secretName,
+            }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`${i18nKey}.selectSecret`));
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`commands.secret.subcommands.delete.selectSecret`));
             secretName = secretToModify;
         }
         const confirmDelete = force ||
-            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`${i18nKey}.confirmDelete`, { secretName }), {
+            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`commands.secret.subcommands.delete.confirmDelete`, {
+                secretName,
+            }), {
                 defaultAnswer: false,
             }));
         if (!confirmDelete) {
-            logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.deleteCanceled`));
+            logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.deleteCanceled`));
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         await (0, secrets_1.deleteSecret)(derivedAccountId, secretName);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.delete`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.success.delete`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
         if (secretName) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.delete`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.delete`, {
                 secretName,
             }));
         }
@@ -56,13 +56,10 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function deleteSecretBuilder(yargs) {
     yargs
         .positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.delete.positionals.name.describe`),
         type: 'string',
     })
         .options('force', {
@@ -71,3 +68,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(deleteSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const deleteSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = deleteSecretCommand;

package/commands/secret/listSecret.d.ts

@@ -1,9 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "list";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type ListSecretArgs = CommonArgs & CombinedArgs;
-export declare function handler(args: ArgumentsCamelCase<ListSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ListSecretArgs>;
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ListSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+declare const listSecretCommand: YargsCommandModule<unknown, ListSecretArgs>;
+export default listSecretCommand;

package/commands/secret/listSecret.js

@@ -1,24 +1,20 @@
 "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 secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.list';
-exports.command = 'list';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'list';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.list.describe`);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('secrets-list', {}, derivedAccountId);
     try {
         const { data: { results }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
-        const groupLabel = (0, lang_1.i18n)(`${i18nKey}.groupLabel`, {
+        const groupLabel = (0, lang_1.i18n)(`commands.secret.subcommands.list.groupLabel`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
         });
         logger_1.logger.group(groupLabel);
@@ -26,16 +22,26 @@ async function handler(args) {
         logger_1.logger.groupEnd();
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.list`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.list.errors.list`));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
             request: 'add secret',
             accountId: derivedAccountId,
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function listSecretBuilder(yargs) {
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(listSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const listSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = listSecretCommand;

package/commands/secret/updateSecret.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "update [name]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type UpdateSecretArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type UpdateSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<UpdateSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<UpdateSecretArgs>;
-export {};
+declare const updateSecretCommand: YargsCommandModule<unknown, UpdateSecretArgs>;
+export default updateSecretCommand;

package/commands/secret/updateSecret.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.update';
-exports.command = 'update [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'update [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.update.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -22,23 +18,25 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSecret`, { secretName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.update.errors.noSecret`, {
+                secretName,
+            }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`${i18nKey}.selectSecret`));
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`commands.secret.subcommands.update.selectSecret`));
             secretName = secretToModify;
         }
         const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
         await (0, secrets_1.updateSecret)(derivedAccountId, secretName, secretValue);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.update`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.update.success.update`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.success.updateExplanation`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.secret.subcommands.update.success.updateExplanation`));
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.update`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.update.errors.update`, {
             secretName: secretName || '',
         }));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
@@ -47,13 +45,23 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function updateSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.update.positionals.name.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(updateSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const updateSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = updateSecretCommand;

package/commands/secret.d.ts

@@ -1,4 +1,3 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const secretCommand: YargsCommandModuleBucket;
+export default secretCommand;

package/commands/secret.js

@@ -1,56 +1,30 @@
 "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;
-    };
-})();
+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.builder = builder;
-const commonOpts_1 = require("../lib/commonOpts");
-const addSecretCommand = __importStar(require("./secret/addSecret"));
-const listSecretCommand = __importStar(require("./secret/listSecret"));
-const deleteSecretCommand = __importStar(require("./secret/deleteSecret"));
-const updateSecretCommand = __importStar(require("./secret/updateSecret"));
+const addSecret_1 = __importDefault(require("./secret/addSecret"));
+const listSecret_1 = __importDefault(require("./secret/listSecret"));
+const deleteSecret_1 = __importDefault(require("./secret/deleteSecret"));
+const updateSecret_1 = __importDefault(require("./secret/updateSecret"));
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.secret';
-exports.command = ['secret', 'secrets'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['secret', 'secrets'];
+const describe = (0, lang_1.i18n)(`commands.secret.describe`);
+function secretBuilder(yargs) {
     yargs
-        .command(listSecretCommand)
-        .command(addSecretCommand)
-        .command(updateSecretCommand)
-        .command(deleteSecretCommand)
+        .command(listSecret_1.default)
+        .command(addSecret_1.default)
+        .command(updateSecret_1.default)
+        .command(deleteSecret_1.default)
         .demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(secretBuilder, command, describe);
+const secretCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = secretCommand;

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

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

package/commands/theme/generate-selectors.js

@@ -3,14 +3,12 @@ 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 en_1 = require("../../lang/en");
 const generateSelectors_1 = require("../../lib/generateSelectors");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
 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');
@@ -20,14 +18,13 @@ const CSS_VARS_NAME_REGEX = new RegExp(/(--[\w.(,\d\-)]*)/, 'g');
 const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 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`);
+const command = 'generate-selectors <path>';
+const describe = en_1.commands.theme.subcommands.generateSelectors.describe;
 async function handler(args) {
     const { path } = args;
     const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
     if (!fieldsJsonPath) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.fieldsNotFound`));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.fieldsNotFound);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     let fieldsJson = JSON.parse(fs_1.default.readFileSync(fieldsJsonPath, 'utf-8'));
@@ -137,7 +134,7 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSelectorsFound`));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.noSelectorsFound);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     Object.keys(finalMap).forEach(themeFieldKey => {
@@ -154,16 +151,23 @@ async function handler(args) {
     const selectorsMap = (0, generateSelectors_1.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`, {
-        themePath: path,
-        selectorsPath,
-    }));
+    logger_1.uiLogger.success(en_1.commands.theme.subcommands.generateSelectors.success(path, selectorsPath));
 }
-function builder(yargs) {
+function themeSelectorBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: en_1.commands.theme.subcommands.generateSelectors.positionals.path,
         type: 'string',
         required: true,
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(themeSelectorBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const themeSelectorsCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = themeSelectorsCommand;

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

@@ -1,11 +1,6 @@
-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 & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ThemeValidateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     path: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ThemeValidateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemeValidateArgs>;
-export {};
+declare const themeValidateCommand: YargsCommandModule<unknown, ThemeValidateArgs>;
+export default themeValidateCommand;

package/commands/theme/marketplace-validate.js

@@ -3,43 +3,47 @@ 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 SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
-const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
-exports.command = 'marketplace-validate <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const en_1 = require("../../lang/en");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'marketplace-validate <path>';
+const describe = en_1.commands.theme.subcommands.marketplaceValidate.describe;
 async function handler(args) {
     const { path, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('validate', {}, derivedAccountId);
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add('marketplaceValidation', {
-        text: (0, lang_1.i18n)(`${i18nKey}.logs.validatingTheme`, {
-            path,
-        }),
+        text: en_1.commands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
     });
     const assetType = 'THEME';
     const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, path);
     await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
     SpinniesManager_1.default.remove('marketplaceValidation');
     const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
-    (0, marketplaceValidate_1.processValidationErrors)(i18nKey, validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)(i18nKey, validationResults);
+    (0, marketplaceValidate_1.processValidationErrors)(en_1.commands.theme.subcommands.marketplaceValidate.errors.invalidPath, validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)(en_1.commands.theme.subcommands.marketplaceValidate.results, validationResults);
     process.exit();
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function themeValidateBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: en_1.commands.theme.subcommands.marketplaceValidate.positionals.path.describe,
         type: 'string',
         required: true,
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(themeValidateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const themeValidateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = themeValidateCommand;

package/commands/theme/preview.d.ts

@@ -1,9 +1,5 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs } from '../../types/Yargs';
-export declare const command = "preview [--src] [--dest]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs;
-type ThemePreviewArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule } from '../../types/Yargs';
+type ThemePreviewArgs = CommonArgs & ConfigArgs & AccountArgs & {
     src: string;
     dest: string;
     notify: string;
@@ -12,6 +8,5 @@ type ThemePreviewArgs = CombinedArgs & {
     resetSession?: boolean;
     generateFieldsTypes?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<ThemePreviewArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemePreviewArgs>;
-export {};
+declare const themePreviewCommand: YargsCommandModule<unknown, ThemePreviewArgs>;
+export default themePreviewCommand;