@hubspot/cli 7.7.19-experimental.3 → 7.7.21-experimental.0

package/commands/testAccount/createConfig.d.ts

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

package/commands/testAccount/createConfig.js

@@ -1,42 +1,37 @@
-"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, tiers, 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,
         tiers,
     });
     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: 'test-account-config.json',
-            validate: path => {
+            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;
                 }
                 return true;
             },
@@ -44,49 +39,49 @@ 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('tiers', {
         type: 'array',
-        description: en_1.commands.testAccount.createConfig.options.tiers,
+        description: commands.testAccount.createConfig.options.tiers,
     });
     yargs.option('path', {
         type: 'string',
-        description: en_1.commands.testAccount.createConfig.options.path,
+        description: commands.testAccount.createConfig.options.path,
     });
     yargs.example([
         [
             '$0 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 = {
@@ -95,4 +90,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.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,28 @@
+import yargs from 'yargs';
+import generateSelectorsCommand from '../generate-selectors.js';
+const positionalSpy = vi
+    .spyOn(yargs, 'positional')
+    .mockReturnValue(yargs);
+describe('commands/theme/generate-selectors', () => {
+    describe('command', () => {
+        it('should have the correct command structure', () => {
+            expect(generateSelectorsCommand.command).toEqual('generate-selectors <path>');
+        });
+    });
+    describe('describe', () => {
+        it('should provide a description', () => {
+            expect(generateSelectorsCommand.describe).toBeDefined();
+        });
+    });
+    describe('builder', () => {
+        it('should support the correct options', () => {
+            generateSelectorsCommand.builder(yargs);
+            expect(positionalSpy).toHaveBeenCalledTimes(1);
+            expect(positionalSpy).toHaveBeenCalledWith('path', {
+                describe: expect.any(String),
+                required: true,
+                type: 'string',
+            });
+        });
+    });
+});

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,36 @@
+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, 'positional')
+    .mockReturnValue(yargs);
+describe('commands/theme/marketplace-validate', () => {
+    describe('command', () => {
+        it('should have the correct command structure', () => {
+            expect(marketplaceValidateCommand.command).toEqual('marketplace-validate <path>');
+        });
+    });
+    describe('describe', () => {
+        it('should provide a description', () => {
+            expect(marketplaceValidateCommand.describe).toBeDefined();
+        });
+    });
+    describe('builder', () => {
+        it('should support the correct options', () => {
+            marketplaceValidateCommand.builder(yargs);
+            expect(positionalSpy).toHaveBeenCalledTimes(1);
+            expect(positionalSpy).toHaveBeenCalledWith('path', {
+                describe: expect.any(String),
+                required: true,
+                type: 'string',
+            });
+            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.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,60 @@
+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, 'option')
+    .mockReturnValue(yargs);
+describe('commands/theme/preview', () => {
+    describe('command', () => {
+        it('should have the correct command structure', () => {
+            expect(themePreviewCommand.command).toEqual('preview [--src] [--dest]');
+        });
+    });
+    describe('describe', () => {
+        it('should provide a description', () => {
+            expect(themePreviewCommand.describe).toBeDefined();
+        });
+    });
+    describe('builder', () => {
+        it('should support the correct options', () => {
+            themePreviewCommand.builder(yargs);
+            expect(optionSpy).toHaveBeenCalledWith('src', {
+                describe: expect.any(String),
+                type: 'string',
+                requiresArg: true,
+            });
+            expect(optionSpy).toHaveBeenCalledWith('dest', {
+                describe: expect.any(String),
+                type: 'string',
+                requiresArg: true,
+            });
+            expect(optionSpy).toHaveBeenCalledWith('notify', {
+                describe: expect.any(String),
+                alias: 'n',
+                type: 'string',
+                requiresArg: true,
+            });
+            expect(optionSpy).toHaveBeenCalledWith('no-ssl', {
+                describe: expect.any(String),
+                type: 'boolean',
+            });
+            expect(optionSpy).toHaveBeenCalledWith('port', {
+                describe: expect.any(String),
+                type: 'number',
+            });
+            expect(optionSpy).toHaveBeenCalledWith('resetSession', {
+                hidden: true,
+                type: 'boolean',
+            });
+            expect(optionSpy).toHaveBeenCalledWith('generateFieldsTypes', {
+                hidden: true,
+                type: 'boolean',
+            });
+            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;
 };

package/commands/theme/generate-selectors.js

@@ -1,14 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-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");
+import fs from 'fs';
+import { commands } from '../../lang/en.js';
+import { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } from '../../lib/generateSelectors.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 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');
@@ -19,16 +14,16 @@ 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 command = 'generate-selectors <path>';
-const describe = en_1.commands.theme.subcommands.generateSelectors.describe;
+const describe = commands.theme.subcommands.generateSelectors.describe;
 async function handler(args) {
     const { path } = args;
-    const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
+    const fieldsJsonPath = findFieldsJsonPath(path);
     if (!fieldsJsonPath) {
-        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.fieldsNotFound);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        uiLogger.error(commands.theme.subcommands.generateSelectors.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, 'utf-8'));
+    let cssString = combineThemeCss(path) ?? '';
     /**
      * Creates map of HubL variable names to theme field paths
      */
@@ -134,34 +129,34 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.noSelectorsFound);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        uiLogger.error(commands.theme.subcommands.generateSelectors.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);
     }
-    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.uiLogger.success(en_1.commands.theme.subcommands.generateSelectors.success(path, selectorsPath));
+    fs.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
+    uiLogger.success(commands.theme.subcommands.generateSelectors.success(path, selectorsPath));
 }
 function themeSelectorBuilder(yargs) {
     yargs.positional('path', {
-        describe: en_1.commands.theme.subcommands.generateSelectors.positionals.path,
+        describe: commands.theme.subcommands.generateSelectors.positionals.path,
         type: 'string',
         required: true,
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(themeSelectorBuilder, command, describe, {
+const builder = makeYargsBuilder(themeSelectorBuilder, command, describe, {
     useGlobalOptions: true,
 });
 const themeSelectorsCommand = {
@@ -170,4 +165,4 @@ const themeSelectorsCommand = {
     handler,
     builder,
 };
-exports.default = themeSelectorsCommand;
+export default themeSelectorsCommand;

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

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

package/commands/theme/marketplace-validate.js

@@ -1,40 +1,35 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
-const usageTracking_1 = require("../../lib/usageTracking");
-const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
-const en_1 = require("../../lang/en");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } from '../../lib/marketplaceValidate.js';
+import { commands } from '../../lang/en.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'marketplace-validate <path>';
-const describe = en_1.commands.theme.subcommands.marketplaceValidate.describe;
+const describe = 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: en_1.commands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
+    trackCommandUsage('validate', {}, derivedAccountId);
+    SpinniesManager.init();
+    SpinniesManager.add('marketplaceValidation', {
+        text: 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)(en_1.commands.theme.subcommands.marketplaceValidate.errors.invalidPath, validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)(en_1.commands.theme.subcommands.marketplaceValidate.results, validationResults);
+    const validationId = await kickOffValidation(derivedAccountId, assetType, path);
+    await pollForValidationFinish(derivedAccountId, validationId);
+    SpinniesManager.remove('marketplaceValidation');
+    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
+    processValidationErrors(commands.theme.subcommands.marketplaceValidate.errors.invalidPath, validationResults);
+    displayValidationResults(commands.theme.subcommands.marketplaceValidate.results, validationResults);
     process.exit();
 }
 function themeValidateBuilder(yargs) {
     yargs.positional('path', {
-        describe: en_1.commands.theme.subcommands.marketplaceValidate.positionals.path.describe,
+        describe: commands.theme.subcommands.marketplaceValidate.positionals.path.describe,
         type: 'string',
         required: true,
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(themeValidateBuilder, command, describe, {
+const builder = makeYargsBuilder(themeValidateBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -46,4 +41,4 @@ const themeValidateCommand = {
     handler,
     builder,
 };
-exports.default = themeValidateCommand;
+export default themeValidateCommand;

package/commands/theme/preview.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule } from '../../types/Yargs.js';
 type ThemePreviewArgs = CommonArgs & ConfigArgs & AccountArgs & {
     src: string;
     dest: string;