@hubspot/cli 7.5.2-experimental.0 → 7.5.3-beta.0

package/commands/theme/preview.js

@@ -3,37 +3,32 @@ 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");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
 const process_1 = require("../../lib/process");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
 const hasFeature_1 = require("../../lib/hasFeature");
-const i18nKey = 'commands.theme.subcommands.preview';
-exports.command = 'preview [--src] [--dest]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const constants_1 = require("../../lib/constants");
+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)(`${i18nKey}.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)(`${i18nKey}.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);
@@ -63,7 +58,7 @@ function handleUserInput() {
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await (0, projects_1.getProjectConfig)();
+    const { projectDir, projectConfig } = await (0, config_1.getProjectConfig)();
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
         const previewPromptAnswers = await (0, previewPrompt_1.previewPrompt)(args);
@@ -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)(`${i18nKey}.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)(`${i18nKey}.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)(`${i18nKey}.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)(`${i18nKey}.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,9 +153,9 @@ 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, 'cms:react:unifiedThemePreview');
+    const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, constants_1.FEATURES.UNIFIED_THEME_PREVIEW);
     if (isUngatedForUnified && createUnifiedDevServer) {
         if (port) {
             process.env['PORT'] = port.toString();
@@ -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)(`${i18nKey}.options.src.describe`),
+        describe: en_1.commands.theme.subcommands.preview.positionals.src,
         type: 'string',
         requiresArg: true,
     })
         .option('dest', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.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)(`${i18nKey}.options.notify.describe`),
+        describe: en_1.commands.theme.subcommands.preview.options.notify,
         type: 'string',
         requiresArg: true,
     })
         .option('no-ssl', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.noSsl.describe`),
+        describe: en_1.commands.theme.subcommands.preview.options.noSsl,
         type: 'boolean',
     })
         .option('port', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.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,54 +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");
-const i18nKey = 'commands.theme';
-exports.command = ['theme', 'themes'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.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;

package/commands/upload.js

@@ -1,236 +1,217 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const fs = require('fs');
-const path = require('path');
-const { uploadFolder, hasUploadErrors, } = require('@hubspot/local-dev-lib/cms/uploadFolder');
-const { getFileMapperQueryValues, } = require('@hubspot/local-dev-lib/fileMapper');
-const { upload, deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
-const { getCwd, convertToUnixPath, isAllowedExtension, } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { ApiErrorContext, logError } = require('../lib/errorHandlers/index');
-const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
-const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
-const { getThemePreviewUrl, getThemeJSONPath, } = require('@hubspot/local-dev-lib/cms/themes');
-const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
-const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { confirmPrompt } = require('../lib/prompts/promptUtils');
-const { validateCmsPublishMode } = require('../lib/validation');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { getUploadableFileList } = require('../lib/upload');
-const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.upload';
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { FieldsJs, isConvertableFieldJs, cleanupTmpDirSync, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-exports.command = 'upload [src] [dest]';
-exports.describe = i18n(`${i18nKey}.describe`);
-const logThemePreview = (filePath, accountId) => {
-    const previewUrl = getThemePreviewUrl(filePath, accountId);
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const uploadFolder_1 = require("@hubspot/local-dev-lib/cms/uploadFolder");
+const fileMapper_1 = require("@hubspot/local-dev-lib/fileMapper");
+const fileMapper_2 = require("@hubspot/local-dev-lib/api/fileMapper");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const modules_1 = require("@hubspot/local-dev-lib/cms/modules");
+const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
+const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
+const handleFieldsJS_1 = require("@hubspot/local-dev-lib/cms/handleFieldsJS");
+const index_1 = require("../lib/errorHandlers/index");
+const commonOpts_1 = require("../lib/commonOpts");
+const uploadPrompt_1 = require("../lib/prompts/uploadPrompt");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const validation_1 = require("../lib/validation");
+const usageTracking_1 = require("../lib/usageTracking");
+const upload_1 = require("../lib/upload");
+const en_1 = require("../lang/en");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("../lib/ui/logger");
+const command = 'upload [src] [dest]';
+const describe = en_1.commands.upload.describe;
+function logThemePreview(filePath, accountId) {
+    const previewUrl = (0, themes_1.getThemePreviewUrl)(filePath, accountId);
     // Only log if we are actually in a theme
     if (previewUrl) {
-        logger.log(i18n(`${i18nKey}.previewUrl`, {
-            previewUrl,
-        }));
+        logger_1.uiLogger.log(en_1.commands.upload.previewUrl(previewUrl));
     }
-};
-exports.handler = async (options) => {
-    if (!validateCmsPublishMode(options)) {
-        process.exit(EXIT_CODES.WARNING);
+}
+async function handler(args) {
+    if (!(0, validation_1.validateCmsPublishMode)(args)) {
+        process.exit(exitCodes_1.EXIT_CODES.WARNING);
     }
-    const { derivedAccountId } = options;
-    const cmsPublishMode = getCmsPublishMode(options);
-    const uploadPromptAnswers = await uploadPrompt(options);
-    const src = options.src || uploadPromptAnswers.src;
-    const saveOutput = options.saveOutput;
-    let dest = options.dest || uploadPromptAnswers.dest;
-    let absoluteSrcPath = path.resolve(getCwd(), src);
+    const { derivedAccountId } = args;
+    const cmsPublishMode = (0, commonOpts_1.getCmsPublishMode)(args);
+    const uploadPromptAnswers = await (0, uploadPrompt_1.uploadPrompt)(args);
+    const src = args.src || uploadPromptAnswers.src;
+    const saveOutput = args.saveOutput;
+    let dest = args.dest || uploadPromptAnswers.dest;
+    let absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
     if (!dest) {
-        logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
+        logger_1.uiLogger.error(en_1.commands.upload.errors.destinationRequired);
         return;
     }
     // Check for theme.json file and determine the root path for the project based on it if it exists
-    const themeJsonPath = getThemeJSONPath(absoluteSrcPath);
+    const themeJsonPath = (0, themes_1.getThemeJSONPath)(absoluteSrcPath);
     const projectRoot = themeJsonPath
-        ? path.dirname(themeJsonPath)
-        : path.dirname(getCwd());
+        ? path_1.default.dirname(themeJsonPath)
+        : path_1.default.dirname((0, path_2.getCwd)());
     const convertFields = projectRoot &&
-        isConvertableFieldJs(projectRoot, absoluteSrcPath, options.convertFields);
+        (0, handleFieldsJS_1.isConvertableFieldJs)(projectRoot, absoluteSrcPath, args.convertFields);
     let fieldsJs;
     if (convertFields) {
-        fieldsJs = await new FieldsJs(projectRoot, absoluteSrcPath, undefined, options.fieldOptions).init();
+        fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, absoluteSrcPath, undefined, args.fieldOptions).init();
         if (fieldsJs.rejected)
             return;
         // Ensures that the dest path is a .json. The user might pass '.js' accidentally - this ensures it just works.
-        absoluteSrcPath = fieldsJs.outputPath;
-        dest = path.join(path.dirname(dest), 'fields.json');
+        if (fieldsJs.outputPath) {
+            absoluteSrcPath = fieldsJs.outputPath;
+        }
+        dest = path_1.default.join(path_1.default.dirname(dest), 'fields.json');
     }
     let stats;
     try {
-        stats = fs.statSync(absoluteSrcPath);
+        stats = fs_1.default.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
-                path: src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
-            path: src,
-        }));
+        logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
         return;
     }
-    const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
-    const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
+    const normalizedDest = (0, path_2.convertToUnixPath)(dest);
+    (0, usageTracking_1.trackCommandUsage)('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    const srcDestIssues = await (0, modules_1.validateSrcAndDestPaths)({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger.error(message));
-        process.exit(EXIT_CODES.WARNING);
+        srcDestIssues.forEach(({ message }) => logger_1.uiLogger.error(message));
+        process.exit(exitCodes_1.EXIT_CODES.WARNING);
     }
     if (stats.isFile()) {
-        if (!isAllowedExtension(src) && !convertFields) {
-            logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
-                path: src,
-            }));
+        if (!(0, path_2.isAllowedExtension)(src) && !convertFields) {
+            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
             return;
         }
-        if (shouldIgnoreFile(absoluteSrcPath)) {
-            logger.error(i18n(`${i18nKey}.errors.fileIgnored`, {
-                path: src,
-            }));
+        if ((0, ignoreRules_1.shouldIgnoreFile)(absoluteSrcPath)) {
+            logger_1.uiLogger.error(en_1.commands.upload.errors.fileIgnored(src));
             return;
         }
-        upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode, options))
+        (0, fileMapper_2.upload)(derivedAccountId, absoluteSrcPath, normalizedDest, (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode))
             .then(() => {
-            logger.success(i18n(`${i18nKey}.success.fileUploaded`, {
-                accountId: derivedAccountId,
-                dest: normalizedDest,
-                src,
-            }));
+            logger_1.uiLogger.success(en_1.commands.upload.success.fileUploaded(src, normalizedDest, derivedAccountId));
             logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
-            logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
-                dest: normalizedDest,
-                src,
-            }));
-            logError(error, new ApiErrorContext({
+            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, normalizedDest));
+            (0, index_1.logError)(error, new index_1.ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
-            process.exit(EXIT_CODES.WARNING);
+            process.exit(exitCodes_1.EXIT_CODES.WARNING);
         })
             .finally(() => {
             if (!convertFields)
                 return;
-            if (saveOutput) {
+            if (saveOutput && fieldsJs) {
                 fieldsJs.saveOutput();
             }
-            cleanupTmpDirSync(fieldsJs.rootWriteDir);
+            if (fieldsJs) {
+                (0, handleFieldsJS_1.cleanupTmpDirSync)(fieldsJs.rootWriteDir);
+            }
         });
     }
     else {
-        logger.log(i18n(`${i18nKey}.uploading`, {
-            accountId: derivedAccountId,
-            dest,
-            src,
-        }));
+        logger_1.uiLogger.log(en_1.commands.upload.uploading(src, dest, derivedAccountId));
         // Generate the first-pass file list in here, and pass to uploadFolder.
-        const filePaths = await getUploadableFileList(absoluteSrcPath, options.convertFields);
-        if (options.clean) {
+        const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields ?? false);
+        if (args.clean) {
             //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
-            let cleanUpload = options.force;
-            if (!options.force) {
-                cleanUpload = await confirmPrompt(i18n(`${i18nKey}.confirmCleanUpload`, {
-                    accountId: derivedAccountId,
-                    path: dest,
-                }), { defaultAnswer: false });
+            let cleanUpload = args.force;
+            if (!args.force) {
+                cleanUpload = await (0, promptUtils_1.confirmPrompt)(en_1.commands.upload.confirmCleanUpload(dest, derivedAccountId), { defaultAnswer: false });
             }
             if (cleanUpload) {
                 try {
-                    await deleteFile(derivedAccountId, dest);
-                    logger.log(i18n(`${i18nKey}.cleaning`, {
-                        accountId: derivedAccountId,
-                        filePath: dest,
-                    }));
+                    await (0, fileMapper_2.deleteFile)(derivedAccountId, dest);
+                    logger_1.uiLogger.log(en_1.commands.upload.cleaning(dest, derivedAccountId));
                 }
                 catch (error) {
-                    logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
-                        accountId: derivedAccountId,
-                        path: dest,
-                    }));
+                    logger_1.uiLogger.error(en_1.commands.upload.errors.deleteFailed(dest, derivedAccountId));
                 }
             }
         }
-        uploadFolder(derivedAccountId, absoluteSrcPath, dest, {
-            cmsPublishMode,
-        }, options, filePaths)
+        (0, uploadFolder_1.uploadFolder)(derivedAccountId, absoluteSrcPath, dest, {}, {
+            convertFields: args.convertFields,
+            // @ts-expect-error - fieldOptions is a string or string[]
+            fieldOptions: args.fieldOptions ?? undefined,
+            saveOutput: args.saveOutput,
+        }, filePaths)
             .then(results => {
-            if (!hasUploadErrors(results)) {
-                logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
-                    dest,
-                }));
+            if (!(0, uploadFolder_1.hasUploadErrors)(results)) {
+                logger_1.uiLogger.success(en_1.commands.upload.success.uploadComplete(dest));
                 logThemePreview(src, derivedAccountId);
             }
             else {
-                logger.error(i18n(`${i18nKey}.errors.someFilesFailed`, {
-                    dest,
-                }));
-                process.exit(EXIT_CODES.WARNING);
+                logger_1.uiLogger.error(en_1.commands.upload.errors.someFilesFailed(dest));
+                process.exit(exitCodes_1.EXIT_CODES.WARNING);
             }
         })
             .catch(error => {
-            logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
-                dest,
-                src,
-            }));
-            logError(error, {
+            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, dest));
+            (0, index_1.logError)(error, {
                 accountId: derivedAccountId,
             });
-            process.exit(EXIT_CODES.WARNING);
+            process.exit(exitCodes_1.EXIT_CODES.WARNING);
         });
     }
-};
-exports.builder = yargs => {
+}
+function uploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: en_1.commands.upload.positionals.src,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: en_1.commands.upload.positionals.dest,
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: i18n(`${i18nKey}.options.options.describe`),
+        describe: en_1.commands.upload.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('saveOutput', {
-        describe: i18n(`${i18nKey}.options.saveOutput.describe`),
+        describe: en_1.commands.upload.options.saveOutput,
         type: 'boolean',
         default: false,
     });
     yargs.option('convertFields', {
-        describe: i18n(`${i18nKey}.options.convertFields.describe`),
+        describe: en_1.commands.upload.options.convertFields,
         type: 'boolean',
         default: false,
     });
     yargs.option('clean', {
-        describe: i18n(`${i18nKey}.options.clean.describe`),
+        describe: en_1.commands.upload.options.clean,
         type: 'boolean',
         default: false,
     });
     yargs.option('force', {
-        describe: i18n(`${i18nKey}.options.force.describe`),
+        describe: en_1.commands.upload.options.force,
         type: 'boolean',
         default: false,
     });
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addCmsPublishModeOptions(yargs, { write: true });
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(uploadBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useCmsPublishModeOptions: true,
+});
+const uploadCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = uploadCommand;

package/commands/watch.d.ts

@@ -1 +1,14 @@
-export {};
+import { AccountArgs, CmsPublishModeArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs';
+type WatchCommandArgs = ConfigArgs & AccountArgs & EnvironmentArgs & CommonArgs & CmsPublishModeArgs & {
+    src?: string;
+    dest?: string;
+    fieldOptions?: string[];
+    remove?: boolean;
+    initialUpload?: boolean;
+    disableInitial?: boolean;
+    notify?: string;
+    convertFields?: boolean;
+    saveOutput?: boolean;
+};
+declare const watchCommand: YargsCommandModule<unknown, WatchCommandArgs>;
+export default watchCommand;