@hubspot/cli 7.5.11-experimental.0 → 7.6.0-beta.1

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,17 +1,14 @@
 "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");
-exports.command = 'list';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.list.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);
@@ -32,9 +29,19 @@ async function handler(args) {
         }));
     }
 }
-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,19 +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");
-exports.command = 'update [name]';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.update.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;
@@ -48,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)(`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,55 +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");
-exports.command = ['secret', 'secrets'];
-exports.describe = (0, lang_1.i18n)(`commands.secret.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/testAccount/create.d.ts

@@ -0,0 +1,6 @@
+import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs } from '../../types/Yargs';
+type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
+    configPath?: string;
+};
+declare const createTestAccountCommand: YargsCommandModule<unknown, CreateTestAccountArgs>;
+export default createTestAccountCommand;

package/commands/testAccount/create.js

@@ -0,0 +1,100 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const logger_1 = require("../../lib/ui/logger");
+const usageTracking_1 = require("../../lib/usageTracking");
+const validation_1 = require("../../lib/validation");
+const en_1 = require("../../lang/en");
+const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
+const command = 'create';
+const describe = en_1.commands.testAccount.create.describe;
+async function handler(args) {
+    const { derivedAccountId, configPath } = args;
+    (0, usageTracking_1.trackCommandUsage)('test-account-create', {}, derivedAccountId);
+    let accountConfigPath = configPath;
+    let testAccountConfig;
+    if (!accountConfigPath) {
+        const createTestAccountFromConfig = await (0, promptUtils_1.listPrompt)(en_1.commands.testAccount.create.createTestAccountFromConfigPrompt, {
+            choices: [
+                {
+                    name: en_1.commands.testAccount.create.createFromConfigOption,
+                    value: true,
+                },
+                {
+                    name: en_1.commands.testAccount.create.createFromScratchOption,
+                    value: false,
+                },
+            ],
+        });
+        if (createTestAccountFromConfig) {
+            const configPathPromptResult = await (0, promptUtils_1.promptUser)({
+                name: 'configPath',
+                message: en_1.commands.testAccount.create.configPathPrompt,
+                type: 'input',
+            });
+            accountConfigPath = configPathPromptResult.configPath;
+        }
+    }
+    if (accountConfigPath) {
+        const absoluteConfigPath = path_1.default.resolve((0, path_2.getCwd)(), accountConfigPath);
+        if (!(0, validation_1.fileExists)(absoluteConfigPath)) {
+            logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        try {
+            testAccountConfig = JSON.parse(fs_extra_1.default.readFileSync(absoluteConfigPath, 'utf8'));
+        }
+        catch (err) {
+            logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+    }
+    else {
+        testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)();
+    }
+    try {
+        const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(derivedAccountId, testAccountConfig);
+        logger_1.uiLogger.success(en_1.commands.testAccount.create.success.configFileUpdated(testAccountConfig.accountName, data.id));
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.failedToCreate);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function createTestAccountBuilder(yargs) {
+    yargs.option('config-path', {
+        type: 'string',
+        description: en_1.commands.testAccount.create.options.configPath,
+    });
+    yargs.example([
+        [
+            '$0 create --config-path ./test-account-config.json',
+            en_1.commands.testAccount.create.example('./test-account-config.json'),
+        ],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(createTestAccountBuilder, command, describe, {
+    useGlobalOptions: true,
+    useEnvironmentOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useTestingOptions: true,
+});
+const createTestAccountCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = createTestAccountCommand;

package/commands/testAccount/createConfig.d.ts

@@ -0,0 +1,10 @@
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { HubConfig } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt';
+type CreateTestAccountConfigArgs = CommonArgs & {
+    name?: string;
+    description?: string;
+    tiers?: HubConfig[];
+    path?: string;
+};
+declare const createTestAccountConfigCommand: YargsCommandModule<unknown, CreateTestAccountConfigArgs>;
+export default createTestAccountConfigCommand;

package/commands/testAccount/createConfig.js

@@ -0,0 +1,98 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const logger_1 = require("../../lib/ui/logger");
+const usageTracking_1 = require("../../lib/usageTracking");
+const en_1 = require("../../lang/en");
+const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
+const validation_1 = require("../../lib/validation");
+const command = 'create-config';
+const describe = en_1.commands.testAccount.createConfig.describe;
+async function handler(args) {
+    const { derivedAccountId, name, tiers, description, path: configPath } = args;
+    (0, usageTracking_1.trackCommandUsage)('test-account-create-config', {}, derivedAccountId);
+    let accountConfigPath = configPath;
+    const testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)({
+        name,
+        description,
+        tiers,
+    });
+    if (!accountConfigPath) {
+        const pathPromptResult = await (0, promptUtils_1.promptUser)({
+            name: 'path',
+            message: en_1.commands.testAccount.createConfig.pathPrompt,
+            type: 'input',
+            default: 'test-account-config.json',
+            validate: path => {
+                if (!path) {
+                    return en_1.commands.testAccount.createConfig.errors.pathError;
+                }
+                else if (!path.endsWith('.json')) {
+                    return en_1.commands.testAccount.createConfig.errors.pathFormatError;
+                }
+                return true;
+            },
+        });
+        accountConfigPath = pathPromptResult.path;
+    }
+    if (!accountConfigPath) {
+        logger_1.uiLogger.error(en_1.commands.testAccount.createConfig.errors.pathError);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if ((0, validation_1.fileExists)(accountConfigPath)) {
+        logger_1.uiLogger.error(en_1.commands.testAccount.createConfig.errors.pathExistsError);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    try {
+        fs_extra_1.default.writeFileSync(path_1.default.resolve((0, path_2.getCwd)(), accountConfigPath), JSON.stringify(testAccountConfig, null, 2), 'utf8');
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.testAccount.createConfig.errors.failedToCreate);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    logger_1.uiLogger.success(en_1.commands.testAccount.createConfig.success.configFileCreated(accountConfigPath));
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function createTestAccountConfigBuilder(yargs) {
+    yargs.option('name', {
+        type: 'string',
+        description: en_1.commands.testAccount.createConfig.options.name,
+    });
+    yargs.option('description', {
+        type: 'string',
+        description: en_1.commands.testAccount.createConfig.options.description,
+    });
+    yargs.option('tiers', {
+        type: 'array',
+        description: en_1.commands.testAccount.createConfig.options.tiers,
+    });
+    yargs.option('path', {
+        type: 'string',
+        description: en_1.commands.testAccount.createConfig.options.path,
+    });
+    yargs.example([
+        [
+            '$0 create-config --name my-account',
+            en_1.commands.testAccount.createConfig.example('my-account'),
+        ],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(createTestAccountConfigBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const createTestAccountConfigCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = createTestAccountConfigCommand;

package/commands/testAccount/delete.d.ts

@@ -0,0 +1,6 @@
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
+type DeleteTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
+    testAccountId: number;
+};
+declare const deleteTestAccountCommand: YargsCommandModule<unknown, DeleteTestAccountArgs>;
+export default deleteTestAccountCommand;

package/commands/testAccount/delete.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const logger_1 = require("../../lib/ui/logger");
+const usageTracking_1 = require("../../lib/usageTracking");
+const en_1 = require("../../lang/en");
+const command = 'delete <test-account-id>';
+const describe = en_1.commands.testAccount.delete.describe;
+async function handler(args) {
+    const { derivedAccountId, testAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('test-account-delete', {}, derivedAccountId);
+    try {
+        await (0, developerTestAccounts_1.deleteDeveloperTestAccount)(derivedAccountId, testAccountId, true);
+        logger_1.uiLogger.success(en_1.commands.testAccount.delete.success.testAccountDeleted(testAccountId));
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.testAccount.delete.errors.failedToDelete);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function deleteTestAccountBuilder(yargs) {
+    yargs.positional('test-account-id', {
+        type: 'number',
+        description: en_1.commands.testAccount.delete.positionals.testAccountId,
+        required: true,
+    });
+    yargs.example([
+        ['$0 delete 1234567890', en_1.commands.testAccount.delete.example(1234567890)],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(deleteTestAccountBuilder, command, describe, {
+    useGlobalOptions: true,
+    useEnvironmentOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useTestingOptions: true,
+});
+const deleteTestAccountCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = deleteTestAccountCommand;

package/commands/testAccount.d.ts

@@ -0,0 +1,3 @@
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const testAccountCommand: YargsCommandModuleBucket;
+export default testAccountCommand;

package/commands/testAccount.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const create_1 = __importDefault(require("./testAccount/create"));
+const createConfig_1 = __importDefault(require("./testAccount/createConfig"));
+const delete_1 = __importDefault(require("./testAccount/delete"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const en_1 = require("../lang/en");
+const command = ['test-account', 'test-accounts'];
+const describe = undefined; //commands.testAccount.describe;
+function testAccountBuilder(yargs) {
+    yargs
+        .command(create_1.default)
+        .command(createConfig_1.default)
+        .command(delete_1.default)
+        .demandCommand(1, '');
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(testAccountBuilder, command, en_1.commands.testAccount.describe);
+const testAccountCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = testAccountCommand;

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,13 +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');
-exports.command = 'generate-selectors <path>';
-exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.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)('commands.theme.subcommands.generateSelectors.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'));
@@ -136,7 +134,7 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.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 => {
@@ -153,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)('commands.theme.subcommands.generateSelectors.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)('commands.theme.subcommands.generateSelectors.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;