@hubspot/cli 7.6.0-beta.5 → 7.6.0-beta.6

package/commands/testAccount/create.js

@@ -1,114 +1,119 @@
-"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 validation_1 = require("../../lib/validation");
-const en_1 = require("../../lang/en");
-const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
-const errorHandlers_1 = require("../../lib/errorHandlers");
-const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
-const buildAccount_1 = require("../../lib/buildAccount");
+import fs from 'fs-extra';
+import path from 'path';
+import { getValidEnv } from '@hubspot/local-dev-lib/environment';
+import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { fileExists } from '../../lib/validation.js';
+import { commands } from '../../lang/en.js';
+import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt.js';
+import { debugError, logError } from '../../lib/errorHandlers/index.js';
+import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { createDeveloperTestAccountV3, saveAccountToConfig, } from '../../lib/buildAccount.js';
 const command = 'create';
-const describe = en_1.commands.testAccount.create.describe;
+const describe = commands.testAccount.create.describe;
 async function handler(args) {
     const { derivedAccountId, configPath, formatOutputAsJson } = args;
-    (0, usageTracking_1.trackCommandUsage)('test-account-create', {}, derivedAccountId);
+    trackCommandUsage('test-account-create', {}, derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
     let accountConfigPath = configPath;
     let testAccountConfig;
     if (!accountConfigPath) {
-        const createTestAccountFromConfig = await (0, promptUtils_1.listPrompt)(en_1.commands.testAccount.create.createTestAccountFromConfigPrompt, {
+        const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
             choices: [
                 {
-                    name: en_1.commands.testAccount.create.createFromConfigOption,
+                    name: commands.testAccount.create.createFromConfigOption,
                     value: true,
                 },
                 {
-                    name: en_1.commands.testAccount.create.createFromScratchOption,
+                    name: commands.testAccount.create.createFromScratchOption,
                     value: false,
                 },
             ],
         });
         if (createTestAccountFromConfig) {
-            const configPathPromptResult = await (0, promptUtils_1.promptUser)({
+            const configPathPromptResult = await promptUser({
                 name: 'configPath',
-                message: en_1.commands.testAccount.create.configPathPrompt,
+                message: 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);
+        const absoluteConfigPath = path.resolve(getCwd(), accountConfigPath);
+        if (!fileExists(absoluteConfigPath)) {
+            uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
+            process.exit(EXIT_CODES.ERROR);
         }
         try {
-            testAccountConfig = JSON.parse(fs_extra_1.default.readFileSync(absoluteConfigPath, 'utf8'));
+            testAccountConfig = JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
         }
         catch (err) {
-            logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     else {
-        testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)();
+        testAccountConfig = await createDeveloperTestAccountConfigPrompt();
     }
-    const jsonOutput = {};
-    let testAccountId;
-    SpinniesManager_1.default.init({
+    const resultJson = {};
+    SpinniesManager.init({
         succeedColor: 'white',
     });
-    SpinniesManager_1.default.add('createTestAccount', {
-        text: en_1.commands.testAccount.create.polling.start(testAccountConfig.accountName),
+    SpinniesManager.add('createTestAccount', {
+        text: commands.testAccount.create.polling.start(testAccountConfig.accountName),
     });
     try {
-        const result = await (0, buildAccount_1.createDeveloperTestAccountV3)(derivedAccountId, testAccountConfig);
-        if (formatOutputAsJson) {
-            jsonOutput.accountName = result.accountName;
-            jsonOutput.accountId = result.accountId;
-            jsonOutput.personalAccessKey = result.personalAccessKey;
-        }
-        testAccountId = result.accountId;
+        const createResult = await createDeveloperTestAccountV3(derivedAccountId, testAccountConfig);
+        resultJson.accountName = createResult.accountName;
+        resultJson.accountId = createResult.accountId;
+        resultJson.personalAccessKey = createResult.personalAccessKey;
     }
     catch (err) {
-        (0, errorHandlers_1.logError)(err);
-        SpinniesManager_1.default.fail('createTestAccount', {
-            text: en_1.commands.testAccount.create.polling.createFailure,
+        logError(err);
+        SpinniesManager.fail('createTestAccount', {
+            text: commands.testAccount.create.polling.createFailure,
         });
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
-    SpinniesManager_1.default.succeed('createTestAccount', {
-        text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
+    SpinniesManager.succeed('createTestAccount', {
+        text: commands.testAccount.create.polling.success(testAccountConfig.accountName, resultJson.accountId),
     });
     if (formatOutputAsJson) {
-        logger_1.uiLogger.json(jsonOutput);
+        uiLogger.json(resultJson);
+    }
+    else {
+        // Only save to config if not using json output
+        try {
+            await saveAccountToConfig(resultJson.accountId, testAccountConfig.accountName, env, resultJson.personalAccessKey);
+        }
+        catch (e) {
+            debugError(e);
+            uiLogger.error(commands.testAccount.create.errors.saveAccountToConfigFailure(testAccountConfig.accountName));
+            process.exit(EXIT_CODES.ERROR);
+        }
     }
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function createTestAccountBuilder(yargs) {
     yargs.option('config-path', {
         type: 'string',
-        description: en_1.commands.testAccount.create.options.configPath,
+        description: 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'),
+            commands.testAccount.create.example('./test-account-config.json'),
         ],
     ]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(createTestAccountBuilder, command, describe, {
+const builder = makeYargsBuilder(createTestAccountBuilder, command, describe, {
     useGlobalOptions: true,
     useEnvironmentOptions: true,
     useAccountOptions: true,
@@ -122,4 +127,4 @@ const createTestAccountCommand = {
     handler,
     builder,
 };
-exports.default = createTestAccountCommand;
+export default createTestAccountCommand;

package/commands/testAccount/createConfig.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 type CreateTestAccountConfigArgs = CommonArgs & {
     name?: string;
     description?: string;

package/commands/testAccount/createConfig.js

@@ -1,45 +1,40 @@
-"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");
+import fs from 'fs-extra';
+import path from 'path';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { promptUser } from '../../lib/prompts/promptUtils.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { commands } from '../../lang/en.js';
+import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt.js';
+import { fileExists } from '../../lib/validation.js';
 const command = 'create-config';
-const describe = en_1.commands.testAccount.createConfig.describe;
+const describe = commands.testAccount.createConfig.describe;
 async function handler(args) {
     const { derivedAccountId, name, description, path: configPath } = args;
-    (0, usageTracking_1.trackCommandUsage)('test-account-create-config', {}, derivedAccountId);
+    trackCommandUsage('test-account-create-config', {}, derivedAccountId);
     let accountConfigPath = configPath;
-    const testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)({
+    const testAccountConfig = await createDeveloperTestAccountConfigPrompt({
         name,
         description,
     });
     if (!accountConfigPath) {
-        const pathPromptResult = await (0, promptUtils_1.promptUser)({
+        const pathPromptResult = await promptUser({
             name: 'path',
-            message: en_1.commands.testAccount.createConfig.pathPrompt,
+            message: commands.testAccount.createConfig.pathPrompt,
             type: 'input',
             default: testAccountConfig.accountName.toLowerCase().replace(/\s+/g, '-') +
                 '.json',
             validate: path => {
                 if (!path) {
-                    return en_1.commands.testAccount.createConfig.errors.pathError;
+                    return commands.testAccount.createConfig.errors.pathError;
                 }
                 else if (!path.endsWith('.json')) {
-                    return en_1.commands.testAccount.createConfig.errors.pathFormatError;
+                    return commands.testAccount.createConfig.errors.pathFormatError;
                 }
-                else if ((0, validation_1.fileExists)(path)) {
-                    return en_1.commands.testAccount.createConfig.errors.pathExistsError;
+                else if (fileExists(path)) {
+                    return commands.testAccount.createConfig.errors.pathExistsError;
                 }
                 return true;
             },
@@ -47,45 +42,45 @@ async function handler(args) {
         accountConfigPath = pathPromptResult.path;
     }
     if (!accountConfigPath) {
-        logger_1.uiLogger.error(en_1.commands.testAccount.createConfig.errors.pathError);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        uiLogger.error(commands.testAccount.createConfig.errors.pathError);
+        process.exit(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);
+    if (fileExists(accountConfigPath)) {
+        uiLogger.error(commands.testAccount.createConfig.errors.pathExistsError);
+        process.exit(EXIT_CODES.ERROR);
     }
     try {
-        fs_extra_1.default.writeFileSync(path_1.default.resolve((0, path_2.getCwd)(), accountConfigPath), JSON.stringify(testAccountConfig, null, 2), 'utf8');
+        fs.writeFileSync(path.resolve(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);
+        uiLogger.error(commands.testAccount.createConfig.errors.failedToCreate);
+        process.exit(EXIT_CODES.ERROR);
     }
-    logger_1.uiLogger.success(en_1.commands.testAccount.createConfig.success.configFileCreated(accountConfigPath));
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    uiLogger.success(commands.testAccount.createConfig.success.configFileCreated(accountConfigPath));
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function createTestAccountConfigBuilder(yargs) {
     yargs.option('name', {
         type: 'string',
-        description: en_1.commands.testAccount.createConfig.options.name,
+        description: commands.testAccount.createConfig.options.name,
     });
     yargs.option('description', {
         type: 'string',
-        description: en_1.commands.testAccount.createConfig.options.description,
+        description: commands.testAccount.createConfig.options.description,
     });
     yargs.option('path', {
         type: 'string',
-        description: en_1.commands.testAccount.createConfig.options.path,
+        description: commands.testAccount.createConfig.options.path,
     });
     yargs.example([
         [
             '$0 test-account create-config --name my-account',
-            en_1.commands.testAccount.createConfig.example('my-account'),
+            commands.testAccount.createConfig.example('my-account'),
         ],
     ]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(createTestAccountConfigBuilder, command, describe, {
+const builder = makeYargsBuilder(createTestAccountConfigBuilder, command, describe, {
     useGlobalOptions: true,
 });
 const createTestAccountConfigCommand = {
@@ -94,4 +89,4 @@ const createTestAccountConfigCommand = {
     handler,
     builder,
 };
-exports.default = createTestAccountConfigCommand;
+export default createTestAccountConfigCommand;

package/commands/testAccount/delete.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs.js';
 type DeleteTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
     testAccountId: number;
 };

package/commands/testAccount/delete.js

@@ -1,38 +1,36 @@
-"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");
+import { deleteDeveloperTestAccount } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { commands } from '../../lang/en.js';
 const command = 'delete <test-account-id>';
-const describe = en_1.commands.testAccount.delete.describe;
+const describe = commands.testAccount.delete.describe;
 async function handler(args) {
     const { derivedAccountId, testAccountId } = args;
-    (0, usageTracking_1.trackCommandUsage)('test-account-delete', {}, derivedAccountId);
+    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));
+        await deleteDeveloperTestAccount(derivedAccountId, testAccountId, true);
+        uiLogger.success(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);
+        uiLogger.error(commands.testAccount.delete.errors.failedToDelete);
+        process.exit(EXIT_CODES.ERROR);
     }
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function deleteTestAccountBuilder(yargs) {
     yargs.positional('test-account-id', {
         type: 'number',
-        description: en_1.commands.testAccount.delete.positionals.testAccountId,
+        description: commands.testAccount.delete.positionals.testAccountId,
         required: true,
     });
     yargs.example([
-        ['$0 delete 1234567890', en_1.commands.testAccount.delete.example(1234567890)],
+        ['$0 delete 1234567890', commands.testAccount.delete.example(1234567890)],
     ]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(deleteTestAccountBuilder, command, describe, {
+const builder = makeYargsBuilder(deleteTestAccountBuilder, command, describe, {
     useGlobalOptions: true,
     useEnvironmentOptions: true,
     useAccountOptions: true,
@@ -45,4 +43,4 @@ const deleteTestAccountCommand = {
     handler,
     builder,
 };
-exports.default = deleteTestAccountCommand;
+export default deleteTestAccountCommand;

package/commands/testAccount.d.ts

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

package/commands/testAccount.js

@@ -1,28 +1,23 @@
-"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");
+import createTestAccountCommand from './testAccount/create.js';
+import createTestAccountConfigCommand from './testAccount/createConfig.js';
+import deleteTestAccountCommand from './testAccount/delete.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { commands } from '../lang/en.js';
 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)
+        .command(createTestAccountCommand)
+        .command(createTestAccountConfigCommand)
+        .command(deleteTestAccountCommand)
         .demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(testAccountBuilder, command, en_1.commands.testAccount.describe);
+const builder = makeYargsBuilder(testAccountBuilder, command, commands.testAccount.describe);
 const testAccountCommand = {
     command,
     describe,
     builder,
     handler: () => { },
 };
-exports.default = testAccountCommand;
+export default testAccountCommand;

package/commands/theme/__tests__/generate-selectors.test.js

@@ -1,27 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const yargs_1 = __importDefault(require("yargs"));
-const generate_selectors_1 = __importDefault(require("../generate-selectors"));
+import yargs from 'yargs';
+import generateSelectorsCommand from '../generate-selectors.js';
 const positionalSpy = vi
-    .spyOn(yargs_1.default, 'positional')
-    .mockReturnValue(yargs_1.default);
+    .spyOn(yargs, 'positional')
+    .mockReturnValue(yargs);
 describe('commands/theme/generate-selectors', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(generate_selectors_1.default.command).toEqual('generate-selectors <path>');
+            expect(generateSelectorsCommand.command).toEqual('generate-selectors <path>');
         });
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(generate_selectors_1.default.describe).toBeDefined();
+            expect(generateSelectorsCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
         it('should support the correct options', () => {
-            generate_selectors_1.default.builder(yargs_1.default);
+            generateSelectorsCommand.builder(yargs);
             expect(positionalSpy).toHaveBeenCalledTimes(1);
             expect(positionalSpy).toHaveBeenCalledWith('path', {
                 describe: expect.any(String),

package/commands/theme/__tests__/marketplace-validate.test.js

@@ -1,41 +1,36 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const yargs_1 = __importDefault(require("yargs"));
-const commonOpts_1 = require("../../../lib/commonOpts");
-const marketplace_validate_1 = __importDefault(require("../marketplace-validate"));
+import yargs from 'yargs';
+import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
+import marketplaceValidateCommand from '../marketplace-validate.js';
 vi.mock('../../../lib/commonOpts');
 const positionalSpy = vi
-    .spyOn(yargs_1.default, 'positional')
-    .mockReturnValue(yargs_1.default);
+    .spyOn(yargs, 'positional')
+    .mockReturnValue(yargs);
 describe('commands/theme/marketplace-validate', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(marketplace_validate_1.default.command).toEqual('marketplace-validate <path>');
+            expect(marketplaceValidateCommand.command).toEqual('marketplace-validate <path>');
         });
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(marketplace_validate_1.default.describe).toBeDefined();
+            expect(marketplaceValidateCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
         it('should support the correct options', () => {
-            marketplace_validate_1.default.builder(yargs_1.default);
+            marketplaceValidateCommand.builder(yargs);
             expect(positionalSpy).toHaveBeenCalledTimes(1);
             expect(positionalSpy).toHaveBeenCalledWith('path', {
                 describe: expect.any(String),
                 required: true,
                 type: 'string',
             });
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledWith(yargs_1.default);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledWith(yargs_1.default);
-            expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledWith(yargs_1.default);
+            expect(addAccountOptions).toHaveBeenCalledTimes(1);
+            expect(addAccountOptions).toHaveBeenCalledWith(yargs);
+            expect(addConfigOptions).toHaveBeenCalledTimes(1);
+            expect(addConfigOptions).toHaveBeenCalledWith(yargs);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargs);
         });
     });
 });

package/commands/theme/__tests__/preview.test.js

@@ -1,29 +1,24 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const yargs_1 = __importDefault(require("yargs"));
-const commonOpts_1 = require("../../../lib/commonOpts");
-const preview_1 = __importDefault(require("../preview"));
+import yargs from 'yargs';
+import { addAccountOptions, addConfigOptions, } from '../../../lib/commonOpts.js';
+import themePreviewCommand from '../preview.js';
 vi.mock('../../../lib/commonOpts');
 const optionSpy = vi
-    .spyOn(yargs_1.default, 'option')
-    .mockReturnValue(yargs_1.default);
+    .spyOn(yargs, 'option')
+    .mockReturnValue(yargs);
 describe('commands/theme/preview', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(preview_1.default.command).toEqual('preview [--src] [--dest]');
+            expect(themePreviewCommand.command).toEqual('preview [--src] [--dest]');
         });
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(preview_1.default.describe).toBeDefined();
+            expect(themePreviewCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
         it('should support the correct options', () => {
-            preview_1.default.builder(yargs_1.default);
+            themePreviewCommand.builder(yargs);
             expect(optionSpy).toHaveBeenCalledWith('src', {
                 describe: expect.any(String),
                 type: 'string',
@@ -56,10 +51,10 @@ describe('commands/theme/preview', () => {
                 hidden: true,
                 type: 'boolean',
             });
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledWith(yargs_1.default);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledWith(yargs_1.default);
+            expect(addAccountOptions).toHaveBeenCalledTimes(1);
+            expect(addAccountOptions).toHaveBeenCalledWith(yargs);
+            expect(addConfigOptions).toHaveBeenCalledTimes(1);
+            expect(addConfigOptions).toHaveBeenCalledWith(yargs);
         });
     });
 });

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

@@ -1,4 +1,4 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 type ThemeSelectorArgs = CommonArgs & {
     path: string;
 };