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

package/commands/theme/preview.js

@@ -1,37 +1,32 @@
-"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 path_1 = __importDefault(require("path"));
-const cli_progress_1 = __importDefault(require("cli-progress"));
-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 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 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 constants_1 = require("../../lib/constants");
-const yargsUtils_1 = require("../../lib/yargsUtils");
-const logger_1 = require("../../lib/ui/logger");
+import fs from 'fs';
+import path from 'path';
+import cliProgress from 'cli-progress';
+import { commands } from '../../lang/en.js';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { FILE_UPLOAD_RESULT_TYPES } from '@hubspot/local-dev-lib/constants/files';
+import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
+import { preview } from '@hubspot/theme-preview-dev-server';
+import { getUploadableFileList } from '../../lib/upload.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { previewPrompt, previewProjectPrompt, } from '../../lib/prompts/previewPrompt.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
+import { handleExit, handleKeypress } from '../../lib/process.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
+import { findProjectComponents } from '../../lib/projects/structure.js';
+import { ComponentTypes } from '../../types/Projects.js';
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'preview [--src] [--dest]';
-const describe = en_1.commands.theme.subcommands.preview.describe;
+const describe = commands.theme.subcommands.preview.describe;
 function validateSrcPath(src) {
     const logInvalidPath = () => {
-        logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.invalidPath(src));
+        uiLogger.error(commands.theme.subcommands.preview.errors.invalidPath(src));
     };
     try {
-        const stats = fs_1.default.statSync(src);
+        const stats = fs.statSync(src);
         if (!stats.isDirectory()) {
             logInvalidPath();
             return false;
@@ -45,11 +40,11 @@ function validateSrcPath(src) {
 }
 function handleUserInput() {
     const onTerminate = () => {
-        logger_1.uiLogger.log(en_1.commands.theme.subcommands.preview.logs.processExited);
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        uiLogger.log(commands.theme.subcommands.preview.logs.processExited);
+        process.exit(EXIT_CODES.SUCCESS);
     };
-    (0, process_1.handleExit)(onTerminate);
-    (0, process_1.handleKeypress)(key => {
+    handleExit(onTerminate);
+    handleKeypress(key => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             onTerminate();
         }
@@ -58,33 +53,33 @@ function handleUserInput() {
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await (0, config_1.getProjectConfig)();
+    const { projectDir, projectConfig } = await getProjectConfig();
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
-        const previewPromptAnswers = await (0, previewPrompt_1.previewPrompt)(args);
+        const previewPromptAnswers = await previewPrompt(args);
         const src = args.src || previewPromptAnswers.src;
         dest = args.dest || previewPromptAnswers.dest;
-        absoluteSrc = path_1.default.resolve((0, path_2.getCwd)(), src);
+        absoluteSrc = path.resolve(getCwd(), src);
         if (!dest || !validateSrcPath(absoluteSrc)) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     else {
         // In a project
-        let themeJsonPath = (0, themes_1.getThemeJSONPath)((0, path_2.getCwd)());
+        let themeJsonPath = getThemeJSONPath(getCwd());
         if (!themeJsonPath) {
-            const projectComponents = await (0, structure_1.findProjectComponents)(projectDir);
-            const themeComponents = projectComponents.filter(c => c.type === Projects_1.ComponentTypes.HublTheme);
+            const projectComponents = await findProjectComponents(projectDir);
+            const themeComponents = projectComponents.filter(c => c.type === ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.noThemeComponents);
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                uiLogger.error(commands.theme.subcommands.preview.errors.noThemeComponents);
+                process.exit(EXIT_CODES.ERROR);
             }
-            const answer = await (0, previewPrompt_1.previewProjectPrompt)(themeComponents);
+            const answer = await previewProjectPrompt(themeComponents);
             themeJsonPath = `${answer.themeComponentPath}/theme.json`;
         }
-        const { dir: themeDir } = path_1.default.parse(themeJsonPath);
+        const { dir: themeDir } = path.parse(themeJsonPath);
         absoluteSrc = themeDir;
-        const { base: themeName } = path_1.default.parse(themeDir);
+        const { base: themeName } = path.parse(themeDir);
         dest = `@projects/${projectConfig.name}/${themeName}`;
     }
     return { absoluteSrc, dest };
@@ -92,15 +87,15 @@ async function determineSrcAndDest(args) {
 async function handler(args) {
     const { derivedAccountId, notify, noSsl, resetSession, port, generateFieldsTypes, } = args;
     const { absoluteSrc, dest } = await determineSrcAndDest(args);
-    const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrc, false);
+    const filePaths = await getUploadableFileList(absoluteSrc, false);
     function startProgressBar(numFiles) {
-        const initialUploadProgressBar = new cli_progress_1.default.SingleBar({
+        const initialUploadProgressBar = new cliProgress.SingleBar({
             gracefulExit: true,
             format: '[{bar}] {percentage}% | {value}/{total} | {label}',
             hideCursor: true,
-        }, cli_progress_1.default.Presets.rect);
+        }, cliProgress.Presets.rect);
         initialUploadProgressBar.start(numFiles, 0, {
-            label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.start,
+            label: commands.theme.subcommands.preview.initialUploadProgressBar.start,
         });
         let uploadsHaveStarted = false;
         const uploadOptions = {
@@ -112,7 +107,7 @@ async function handler(args) {
                 if (!uploadsHaveStarted) {
                     uploadsHaveStarted = true;
                     initialUploadProgressBar.update(0, {
-                        label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar
+                        label: commands.theme.subcommands.preview.initialUploadProgressBar
                             .uploading,
                     });
                 }
@@ -126,13 +121,13 @@ async function handler(args) {
             onFinalErrorCallback: () => initialUploadProgressBar.increment(),
             onFinishCallback: (results) => {
                 initialUploadProgressBar.update(numFiles, {
-                    label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.finish,
+                    label: commands.theme.subcommands.preview.initialUploadProgressBar.finish,
                 });
                 initialUploadProgressBar.stop();
                 results.forEach(result => {
-                    if (result.resultType == files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-                        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({
+                    if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
+                        uiLogger.error(commands.theme.subcommands.preview.errors.uploadFailed(result.file, dest));
+                        logError(result.error, new ApiErrorContext({
                             accountId: derivedAccountId,
                             request: dest,
                             payload: result.file,
@@ -143,7 +138,7 @@ async function handler(args) {
         };
         return uploadOptions;
     }
-    (0, usageTracking_1.trackCommandUsage)('preview', {}, derivedAccountId);
+    trackCommandUsage('preview', {}, derivedAccountId);
     let createUnifiedDevServer;
     try {
         // @ts-ignore TODO: Remove when we deprecate Node 18
@@ -153,9 +148,9 @@ async function handler(args) {
         createUnifiedDevServer = createDevServer;
     }
     catch (e) {
-        logger_1.uiLogger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
+        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);
+    const isUngatedForUnified = await hasFeature(derivedAccountId, FEATURES.UNIFIED_THEME_PREVIEW);
     if (isUngatedForUnified && createUnifiedDevServer) {
         if (port) {
             process.env['PORT'] = port.toString();
@@ -168,7 +163,7 @@ async function handler(args) {
         });
     }
     else {
-        (0, theme_preview_dev_server_1.preview)(derivedAccountId, absoluteSrc, dest, {
+        preview(derivedAccountId, absoluteSrc, dest, {
             notify,
             filePaths,
             noSsl,
@@ -182,27 +177,27 @@ async function handler(args) {
 function themePreviewBuilder(yargs) {
     yargs
         .option('src', {
-        describe: en_1.commands.theme.subcommands.preview.positionals.src,
+        describe: commands.theme.subcommands.preview.positionals.src,
         type: 'string',
         requiresArg: true,
     })
         .option('dest', {
-        describe: en_1.commands.theme.subcommands.preview.positionals.dest,
+        describe: commands.theme.subcommands.preview.positionals.dest,
         type: 'string',
         requiresArg: true,
     })
         .option('notify', {
         alias: 'n',
-        describe: en_1.commands.theme.subcommands.preview.options.notify,
+        describe: commands.theme.subcommands.preview.options.notify,
         type: 'string',
         requiresArg: true,
     })
         .option('no-ssl', {
-        describe: en_1.commands.theme.subcommands.preview.options.noSsl,
+        describe: commands.theme.subcommands.preview.options.noSsl,
         type: 'boolean',
     })
         .option('port', {
-        describe: en_1.commands.theme.subcommands.preview.options.port,
+        describe: commands.theme.subcommands.preview.options.port,
         type: 'number',
     })
         .option('resetSession', {
@@ -215,7 +210,7 @@ function themePreviewBuilder(yargs) {
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(themePreviewBuilder, command, describe, {
+const builder = makeYargsBuilder(themePreviewBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -226,4 +221,4 @@ const themePreviewCommand = {
     handler,
     builder,
 };
-exports.default = themePreviewCommand;
+export default themePreviewCommand;

package/commands/theme.d.ts

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

package/commands/theme.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 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");
+import marketplaceValidate from './theme/marketplace-validate.js';
+import generateSelectors from './theme/generate-selectors.js';
+import previewCommand from './theme/preview.js';
+import { commands } from '../lang/en.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['theme', 'themes'];
-const describe = en_1.commands.theme.describe;
+const describe = commands.theme.describe;
 function themeBuilder(yargs) {
     yargs
-        .command(preview_1.default)
-        .command(marketplace_validate_1.default)
-        .command(generate_selectors_1.default)
+        .command(previewCommand)
+        .command(marketplaceValidate)
+        .command(generateSelectors)
         .demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(themeBuilder, command, describe);
+const builder = makeYargsBuilder(themeBuilder, command, describe);
 const themeCommand = {
     command,
     describe,
     builder,
     handler: () => { },
 };
-exports.default = themeCommand;
+export default themeCommand;

package/commands/upload.d.ts

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

package/commands/upload.js

@@ -1,112 +1,107 @@
-"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 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");
+import fs from 'fs';
+import path from 'path';
+import { uploadFolder, hasUploadErrors, } from '@hubspot/local-dev-lib/cms/uploadFolder';
+import { getFileMapperQueryValues } from '@hubspot/local-dev-lib/fileMapper';
+import { upload, deleteFile } from '@hubspot/local-dev-lib/api/fileMapper';
+import { getCwd, convertToUnixPath, isAllowedExtension, } from '@hubspot/local-dev-lib/path';
+import { validateSrcAndDestPaths } from '@hubspot/local-dev-lib/cms/modules';
+import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
+import { getThemePreviewUrl, getThemeJSONPath, } from '@hubspot/local-dev-lib/cms/themes';
+import { FieldsJs, isConvertableFieldJs, cleanupTmpDirSync, } from '@hubspot/local-dev-lib/cms/handleFieldsJS';
+import { ApiErrorContext, logError } from '../lib/errorHandlers/index.js';
+import { getCmsPublishMode } from '../lib/commonOpts.js';
+import { uploadPrompt } from '../lib/prompts/uploadPrompt.js';
+import { confirmPrompt } from '../lib/prompts/promptUtils.js';
+import { validateCmsPublishMode } from '../lib/validation.js';
+import { trackCommandUsage } from '../lib/usageTracking.js';
+import { getUploadableFileList } from '../lib/upload.js';
+import { commands } from '../lang/en.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { uiLogger } from '../lib/ui/logger.js';
 const command = 'upload [src] [dest]';
-const describe = en_1.commands.upload.describe;
+const describe = commands.upload.describe;
 function logThemePreview(filePath, accountId) {
-    const previewUrl = (0, themes_1.getThemePreviewUrl)(filePath, accountId);
+    const previewUrl = getThemePreviewUrl(filePath, accountId);
     // Only log if we are actually in a theme
     if (previewUrl) {
-        logger_1.uiLogger.log(en_1.commands.upload.previewUrl(previewUrl));
+        uiLogger.log(commands.upload.previewUrl(previewUrl));
     }
 }
 async function handler(args) {
-    if (!(0, validation_1.validateCmsPublishMode)(args)) {
-        process.exit(exitCodes_1.EXIT_CODES.WARNING);
+    if (!validateCmsPublishMode(args)) {
+        process.exit(EXIT_CODES.WARNING);
     }
     const { derivedAccountId } = args;
-    const cmsPublishMode = (0, commonOpts_1.getCmsPublishMode)(args);
-    const uploadPromptAnswers = await (0, uploadPrompt_1.uploadPrompt)(args);
+    const cmsPublishMode = getCmsPublishMode(args);
+    const uploadPromptAnswers = await 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);
+    let absoluteSrcPath = path.resolve(getCwd(), src);
     if (!dest) {
-        logger_1.uiLogger.error(en_1.commands.upload.errors.destinationRequired);
+        uiLogger.error(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 = (0, themes_1.getThemeJSONPath)(absoluteSrcPath);
+    const themeJsonPath = getThemeJSONPath(absoluteSrcPath);
     const projectRoot = themeJsonPath
-        ? path_1.default.dirname(themeJsonPath)
-        : path_1.default.dirname((0, path_2.getCwd)());
+        ? path.dirname(themeJsonPath)
+        : path.dirname(getCwd());
     const convertFields = projectRoot &&
-        (0, handleFieldsJS_1.isConvertableFieldJs)(projectRoot, absoluteSrcPath, args.convertFields);
+        isConvertableFieldJs(projectRoot, absoluteSrcPath, args.convertFields);
     let fieldsJs;
     if (convertFields) {
-        fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, absoluteSrcPath, undefined, args.fieldOptions).init();
+        fieldsJs = await new 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.
         if (fieldsJs.outputPath) {
             absoluteSrcPath = fieldsJs.outputPath;
         }
-        dest = path_1.default.join(path_1.default.dirname(dest), 'fields.json');
+        dest = path.join(path.dirname(dest), 'fields.json');
     }
     let stats;
     try {
-        stats = fs_1.default.statSync(absoluteSrcPath);
+        stats = fs.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
+            uiLogger.error(commands.upload.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
+        uiLogger.error(commands.upload.errors.invalidPath(src));
         return;
     }
-    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 });
+    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 });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger_1.uiLogger.error(message));
-        process.exit(exitCodes_1.EXIT_CODES.WARNING);
+        srcDestIssues.forEach(({ message }) => uiLogger.error(message));
+        process.exit(EXIT_CODES.WARNING);
     }
     if (stats.isFile()) {
-        if (!(0, path_2.isAllowedExtension)(src) && !convertFields) {
-            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
+        if (!isAllowedExtension(src) && !convertFields) {
+            uiLogger.error(commands.upload.errors.invalidPath(src));
             return;
         }
-        if ((0, ignoreRules_1.shouldIgnoreFile)(absoluteSrcPath)) {
-            logger_1.uiLogger.error(en_1.commands.upload.errors.fileIgnored(src));
+        if (shouldIgnoreFile(absoluteSrcPath)) {
+            uiLogger.error(commands.upload.errors.fileIgnored(src));
             return;
         }
-        (0, fileMapper_2.upload)(derivedAccountId, absoluteSrcPath, normalizedDest, (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode))
+        upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode))
             .then(() => {
-            logger_1.uiLogger.success(en_1.commands.upload.success.fileUploaded(src, normalizedDest, derivedAccountId));
+            uiLogger.success(commands.upload.success.fileUploaded(src, normalizedDest, derivedAccountId));
             logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
-            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, normalizedDest));
-            (0, index_1.logError)(error, new index_1.ApiErrorContext({
+            uiLogger.error(commands.upload.errors.uploadFailed(src, normalizedDest));
+            logError(error, new ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
-            process.exit(exitCodes_1.EXIT_CODES.WARNING);
+            process.exit(EXIT_CODES.WARNING);
         })
             .finally(() => {
             if (!convertFields)
@@ -115,93 +110,93 @@ async function handler(args) {
                 fieldsJs.saveOutput();
             }
             if (fieldsJs) {
-                (0, handleFieldsJS_1.cleanupTmpDirSync)(fieldsJs.rootWriteDir);
+                cleanupTmpDirSync(fieldsJs.rootWriteDir);
             }
         });
     }
     else {
-        logger_1.uiLogger.log(en_1.commands.upload.uploading(src, dest, derivedAccountId));
+        uiLogger.log(commands.upload.uploading(src, dest, derivedAccountId));
         // Generate the first-pass file list in here, and pass to uploadFolder.
-        const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields ?? false);
+        const filePaths = await 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 = args.force;
             if (!args.force) {
-                cleanUpload = await (0, promptUtils_1.confirmPrompt)(en_1.commands.upload.confirmCleanUpload(dest, derivedAccountId), { defaultAnswer: false });
+                cleanUpload = await confirmPrompt(commands.upload.confirmCleanUpload(dest, derivedAccountId), { defaultAnswer: false });
             }
             if (cleanUpload) {
                 try {
-                    await (0, fileMapper_2.deleteFile)(derivedAccountId, dest);
-                    logger_1.uiLogger.log(en_1.commands.upload.cleaning(dest, derivedAccountId));
+                    await deleteFile(derivedAccountId, dest);
+                    uiLogger.log(commands.upload.cleaning(dest, derivedAccountId));
                 }
                 catch (error) {
-                    logger_1.uiLogger.error(en_1.commands.upload.errors.deleteFailed(dest, derivedAccountId));
+                    uiLogger.error(commands.upload.errors.deleteFailed(dest, derivedAccountId));
                 }
             }
         }
-        (0, uploadFolder_1.uploadFolder)(derivedAccountId, absoluteSrcPath, dest, {}, {
+        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 (!(0, uploadFolder_1.hasUploadErrors)(results)) {
-                logger_1.uiLogger.success(en_1.commands.upload.success.uploadComplete(dest));
+            if (!hasUploadErrors(results)) {
+                uiLogger.success(commands.upload.success.uploadComplete(dest));
                 logThemePreview(src, derivedAccountId);
             }
             else {
-                logger_1.uiLogger.error(en_1.commands.upload.errors.someFilesFailed(dest));
-                process.exit(exitCodes_1.EXIT_CODES.WARNING);
+                uiLogger.error(commands.upload.errors.someFilesFailed(dest));
+                process.exit(EXIT_CODES.WARNING);
             }
         })
             .catch(error => {
-            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, dest));
-            (0, index_1.logError)(error, {
+            uiLogger.error(commands.upload.errors.uploadFailed(src, dest));
+            logError(error, {
                 accountId: derivedAccountId,
             });
-            process.exit(exitCodes_1.EXIT_CODES.WARNING);
+            process.exit(EXIT_CODES.WARNING);
         });
     }
 }
 function uploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: en_1.commands.upload.positionals.src,
+        describe: commands.upload.positionals.src,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: en_1.commands.upload.positionals.dest,
+        describe: commands.upload.positionals.dest,
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: en_1.commands.upload.options.options,
+        describe: commands.upload.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('saveOutput', {
-        describe: en_1.commands.upload.options.saveOutput,
+        describe: commands.upload.options.saveOutput,
         type: 'boolean',
         default: false,
     });
     yargs.option('convertFields', {
-        describe: en_1.commands.upload.options.convertFields,
+        describe: commands.upload.options.convertFields,
         type: 'boolean',
         default: false,
     });
     yargs.option('clean', {
-        describe: en_1.commands.upload.options.clean,
+        describe: commands.upload.options.clean,
         type: 'boolean',
         default: false,
     });
     yargs.option('force', {
-        describe: en_1.commands.upload.options.force,
+        describe: commands.upload.options.force,
         type: 'boolean',
         default: false,
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(uploadBuilder, command, describe, {
+const builder = makeYargsBuilder(uploadBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -214,4 +209,4 @@ const uploadCommand = {
     handler,
     builder,
 };
-exports.default = uploadCommand;
+export default uploadCommand;

package/commands/watch.d.ts

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