@hubspot/cli 7.7.20-experimental.0 → 7.7.21-experimental.0

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;

package/commands/watch.js

@@ -1,76 +1,71 @@
-"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 watch_1 = require("@hubspot/local-dev-lib/cms/watch");
-const path_2 = require("@hubspot/local-dev-lib/path");
-const commonOpts_1 = require("../lib/commonOpts");
-const uploadPrompt_1 = require("../lib/prompts/uploadPrompt");
-const validation_1 = require("../lib/validation");
-const usageTracking_1 = require("../lib/usageTracking");
-const en_1 = require("../lang/en");
-const upload_1 = require("../lib/upload");
-const errorHandlers_1 = require("../lib/errorHandlers");
-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 { watch } from '@hubspot/local-dev-lib/cms/watch';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { getCmsPublishMode } from '../lib/commonOpts.js';
+import { uploadPrompt } from '../lib/prompts/uploadPrompt.js';
+import { validateCmsPublishMode } from '../lib/validation.js';
+import { trackCommandUsage } from '../lib/usageTracking.js';
+import { commands } from '../lang/en.js';
+import { getUploadableFileList } from '../lib/upload.js';
+import { logError, ApiErrorContext } from '../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { uiLogger } from '../lib/ui/logger.js';
 const command = 'watch [src] [dest]';
-const describe = en_1.commands.watch.describe;
+const describe = commands.watch.describe;
 const handler = async (args) => {
     const { remove, initialUpload, disableInitial, notify, derivedAccountId } = args;
-    if (!(0, validation_1.validateCmsPublishMode)(args)) {
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (!validateCmsPublishMode(args)) {
+        process.exit(EXIT_CODES.ERROR);
     }
-    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 dest = args.dest || uploadPromptAnswers.dest;
-    const absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
+    const absoluteSrcPath = path.resolve(getCwd(), src);
     try {
-        const stats = fs_1.default.statSync(absoluteSrcPath);
+        const stats = fs.statSync(absoluteSrcPath);
         if (!stats.isDirectory()) {
-            logger_1.uiLogger.log(en_1.commands.watch.errors.invalidPath(src));
+            uiLogger.log(commands.watch.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger_1.uiLogger.log(en_1.commands.watch.errors.invalidPath(src));
+        uiLogger.log(commands.watch.errors.invalidPath(src));
         return;
     }
     if (!dest) {
-        logger_1.uiLogger.log(en_1.commands.watch.errors.destinationRequired);
+        uiLogger.log(commands.watch.errors.destinationRequired);
         return;
     }
     let filesToUpload = [];
     if (disableInitial) {
-        logger_1.uiLogger.info(en_1.commands.watch.warnings.disableInitial);
+        uiLogger.info(commands.watch.warnings.disableInitial);
     }
     else if (!initialUpload) {
-        logger_1.uiLogger.info(en_1.commands.watch.warnings.notUploaded(src));
-        logger_1.uiLogger.info(en_1.commands.watch.warnings.initialUpload);
+        uiLogger.info(commands.watch.warnings.notUploaded(src));
+        uiLogger.info(commands.watch.warnings.initialUpload);
     }
     if (initialUpload) {
-        filesToUpload = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields);
+        filesToUpload = await getUploadableFileList(absoluteSrcPath, args.convertFields);
     }
-    (0, usageTracking_1.trackCommandUsage)('watch', { mode: cmsPublishMode }, derivedAccountId);
+    trackCommandUsage('watch', { mode: cmsPublishMode }, derivedAccountId);
     const onUploadFolderError = (error) => {
-        logger_1.uiLogger.error(en_1.commands.watch.errors.folderFailed(src, dest, derivedAccountId));
-        (0, errorHandlers_1.logError)(error, {
+        uiLogger.error(commands.watch.errors.folderFailed(src, dest, derivedAccountId));
+        logError(error, {
             accountId: derivedAccountId,
         });
     };
     const onUploadFileError = (file, destPath, accountId) => (error) => {
-        logger_1.uiLogger.error(en_1.commands.watch.errors.fileFailed(file, destPath, accountId));
-        (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({
+        uiLogger.error(commands.watch.errors.fileFailed(file, destPath, accountId));
+        logError(error, new ApiErrorContext({
             accountId,
             request: destPath,
             payload: file,
         }));
     };
-    (0, watch_1.watch)(derivedAccountId, absoluteSrcPath, dest, {
+    watch(derivedAccountId, absoluteSrcPath, dest, {
         cmsPublishMode,
         remove,
         disableInitial: !initialUpload,
@@ -81,53 +76,53 @@ const handler = async (args) => {
 };
 function watchBuilder(yargs) {
     yargs.positional('src', {
-        describe: en_1.commands.watch.positionals.src,
+        describe: commands.watch.positionals.src,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: en_1.commands.watch.positionals.dest,
+        describe: commands.watch.positionals.dest,
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: en_1.commands.watch.options.options,
+        describe: commands.watch.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('remove', {
         alias: 'r',
-        describe: en_1.commands.watch.options.remove,
+        describe: commands.watch.options.remove,
         type: 'boolean',
     });
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: en_1.commands.watch.options.initialUpload,
+        describe: commands.watch.options.initialUpload,
         type: 'boolean',
     });
     yargs.option('disable-initial', {
-        describe: en_1.commands.watch.options.disableInitial,
+        describe: commands.watch.options.disableInitial,
         type: 'boolean',
         hidden: true,
     });
     yargs.option('notify', {
         alias: 'n',
-        describe: en_1.commands.watch.options.notify,
+        describe: commands.watch.options.notify,
         type: 'string',
         requiresArg: true,
     });
     yargs.option('convertFields', {
-        describe: en_1.commands.watch.options.convertFields,
+        describe: commands.watch.options.convertFields,
         type: 'boolean',
         default: false,
     });
     yargs.option('saveOutput', {
-        describe: en_1.commands.watch.options.saveOutput,
+        describe: commands.watch.options.saveOutput,
         type: 'boolean',
         default: false,
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(watchBuilder, command, describe, {
+const builder = makeYargsBuilder(watchBuilder, command, describe, {
     useConfigOptions: true,
     useAccountOptions: true,
     useGlobalOptions: true,
@@ -140,5 +135,4 @@ const watchCommand = {
     handler,
     builder,
 };
-exports.default = watchCommand;
-module.exports = watchCommand;
+export default watchCommand;

package/lang/en.d.ts

@@ -837,7 +837,6 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
             readonly success: (derivedTargets: string[]) => string;
             readonly errors: {
                 readonly needsNode20: "This feature requires node >=20";
-                readonly errorParsingJsonFIle: (filename: string, errorMessage: string) => string;
             };
             readonly spinners: {
                 readonly failedToConfigure: "Failed to configure the HubSpot mcp server.";