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

package/commands/theme/marketplace-validate.js

@@ -3,42 +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");
-exports.command = 'marketplace-validate <path>';
-exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.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)('commands.theme.subcommands.marketplaceValidate.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)('commands.theme.subcommands.marketplaceValidate', validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)('commands.theme.subcommands.marketplaceValidate', 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)('commands.theme.subcommands.marketplaceValidate.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;

package/commands/theme/preview.js

@@ -3,19 +3,14 @@ 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 path_1 = __importDefault(require("path"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
-const lang_1 = require("../../lib/lang");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
+const en_1 = require("../../lang/en");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
 const theme_preview_dev_server_1 = require("@hubspot/theme-preview-dev-server");
-const commonOpts_1 = require("../../lib/commonOpts");
 const upload_1 = require("../../lib/upload");
 const usageTracking_1 = require("../../lib/usageTracking");
 const previewPrompt_1 = require("../../lib/prompts/previewPrompt");
@@ -27,13 +22,13 @@ const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
 const hasFeature_1 = require("../../lib/hasFeature");
 const constants_1 = require("../../lib/constants");
-exports.command = 'preview [--src] [--dest]';
-exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.preview.describe');
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
+const command = 'preview [--src] [--dest]';
+const describe = en_1.commands.theme.subcommands.preview.describe;
 function validateSrcPath(src) {
     const logInvalidPath = () => {
-        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.invalidPath', {
-            path: src,
-        }));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.invalidPath(src));
     };
     try {
         const stats = fs_1.default.statSync(src);
@@ -50,7 +45,7 @@ function validateSrcPath(src) {
 }
 function handleUserInput() {
     const onTerminate = () => {
-        logger_1.logger.log((0, lang_1.i18n)('commands.theme.subcommands.preview.logs.processExited'));
+        logger_1.uiLogger.log(en_1.commands.theme.subcommands.preview.logs.processExited);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
     (0, process_1.handleExit)(onTerminate);
@@ -81,7 +76,7 @@ async function determineSrcAndDest(args) {
             const projectComponents = await (0, structure_1.findProjectComponents)(projectDir);
             const themeComponents = projectComponents.filter(c => c.type === Projects_1.ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.noThemeComponents'));
+                logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.noThemeComponents);
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
             const answer = await (0, previewPrompt_1.previewProjectPrompt)(themeComponents);
@@ -105,7 +100,7 @@ async function handler(args) {
             hideCursor: true,
         }, cli_progress_1.default.Presets.rect);
         initialUploadProgressBar.start(numFiles, 0, {
-            label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.start'),
+            label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.start,
         });
         let uploadsHaveStarted = false;
         const uploadOptions = {
@@ -117,7 +112,8 @@ async function handler(args) {
                 if (!uploadsHaveStarted) {
                     uploadsHaveStarted = true;
                     initialUploadProgressBar.update(0, {
-                        label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.uploading'),
+                        label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar
+                            .uploading,
                     });
                 }
             },
@@ -130,12 +126,12 @@ async function handler(args) {
             onFinalErrorCallback: () => initialUploadProgressBar.increment(),
             onFinishCallback: (results) => {
                 initialUploadProgressBar.update(numFiles, {
-                    label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.finish'),
+                    label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.finish,
                 });
                 initialUploadProgressBar.stop();
                 results.forEach(result => {
                     if (result.resultType == files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-                        logger_1.logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
+                        logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.uploadFailed(result.file, dest));
                         (0, index_1.logError)(result.error, new index_1.ApiErrorContext({
                             accountId: derivedAccountId,
                             request: dest,
@@ -157,7 +153,7 @@ async function handler(args) {
         createUnifiedDevServer = createDevServer;
     }
     catch (e) {
-        logger_1.logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
+        logger_1.uiLogger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
     }
     const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, constants_1.FEATURES.UNIFIED_THEME_PREVIEW);
     if (isUngatedForUnified && createUnifiedDevServer) {
@@ -183,32 +179,30 @@ async function handler(args) {
         });
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
+function themePreviewBuilder(yargs) {
     yargs
         .option('src', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.src.describe'),
+        describe: en_1.commands.theme.subcommands.preview.positionals.src,
         type: 'string',
         requiresArg: true,
     })
         .option('dest', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.dest.describe'),
+        describe: en_1.commands.theme.subcommands.preview.positionals.dest,
         type: 'string',
         requiresArg: true,
     })
         .option('notify', {
         alias: 'n',
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.notify.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.notify,
         type: 'string',
         requiresArg: true,
     })
         .option('no-ssl', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.noSsl.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.noSsl,
         type: 'boolean',
     })
         .option('port', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.port.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.port,
         type: 'number',
     })
         .option('resetSession', {
@@ -221,3 +215,15 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(themePreviewBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const themePreviewCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = themePreviewCommand;

package/commands/theme.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 themeCommand: YargsCommandModuleBucket;
+export default themeCommand;

package/commands/theme.js

@@ -1,53 +1,28 @@
 "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 marketplaceValidate = __importStar(require("./theme/marketplace-validate"));
-const generateSelectors = __importStar(require("./theme/generate-selectors"));
-const previewCommand = __importStar(require("./theme/preview"));
-const commonOpts_1 = require("../lib/commonOpts");
-const lang_1 = require("../lib/lang");
-exports.command = ['theme', 'themes'];
-exports.describe = (0, lang_1.i18n)('commands.theme.describe');
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+const marketplace_validate_1 = __importDefault(require("./theme/marketplace-validate"));
+const generate_selectors_1 = __importDefault(require("./theme/generate-selectors"));
+const preview_1 = __importDefault(require("./theme/preview"));
+const en_1 = require("../lang/en");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['theme', 'themes'];
+const describe = en_1.commands.theme.describe;
+function themeBuilder(yargs) {
     yargs
-        .command(previewCommand)
-        .command(marketplaceValidate)
-        .command(generateSelectors)
+        .command(preview_1.default)
+        .command(marketplace_validate_1.default)
+        .command(generate_selectors_1.default)
         .demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(themeBuilder, command, describe);
+const themeCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = themeCommand;

package/commands/upload.d.ts

@@ -1 +1,12 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, CmsPublishModeArgs, YargsCommandModule } from '../types/Yargs';
+type UploadArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & CmsPublishModeArgs & {
+    src?: string;
+    dest?: string;
+    fieldOptions?: string | string[];
+    saveOutput?: boolean;
+    convertFields?: boolean;
+    clean?: boolean;
+    force?: boolean;
+};
+declare const uploadCommand: YargsCommandModule<unknown, UploadArgs>;
+export default uploadCommand;