@hubspot/local-dev-lib 4.0.4 → 5.0.0-beta.1

package/lib/cms/processFieldsJs.js

@@ -1,20 +1,13 @@
-"use strict";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const semver_1 = __importDefault(require("semver"));
-const url_1 = require("url");
-const path_2 = require("../path");
-const lang_1 = require("../../utils/lang");
+import path from 'path';
+import fs from 'fs';
+import { pathToFileURL } from 'url';
+import { i18n } from '../../utils/lang.js';
 const i18nKey = 'lib.cms.processFieldsJs';
 const { dirName, fieldOptions, filePath, writeDir } = process.env;
-const baseName = path_1.default.basename(filePath);
+const baseName = path.basename(filePath);
 //TODO - Figure out agnostic logging
-console.info((0, lang_1.i18n)(`${i18nKey}.converting`, {
+console.info(i18n(`${i18nKey}.converting`, {
     src: dirName + `/${baseName}`,
     dest: dirName + '/fields.json',
 }));
@@ -30,26 +23,26 @@ const fieldsPromise = dynamicImport(filePath).catch(e => {
 fieldsPromise.then(fieldsFunc => {
     const fieldsFuncType = typeof fieldsFunc;
     if (fieldsFuncType !== 'function') {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.notFunction`, {
+        throw new Error(i18n(`${i18nKey}.errors.notFunction`, {
             path: filePath,
             returned: fieldsFuncType,
         }));
     }
     return Promise.resolve(fieldsFunc(fieldOptions)).then(fields => {
         if (!Array.isArray(fields)) {
-            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.notArray`, {
+            throw new Error(i18n(`${i18nKey}.errors.notArray`, {
                 path: filePath,
                 returned: typeof fields,
             }));
         }
-        const finalPath = path_1.default.join(writeDir, '/fields.json');
+        const finalPath = path.join(writeDir, '/fields.json');
         return fieldsArrayToJson(fields).then(json => {
-            if (!fs_1.default.existsSync(writeDir)) {
-                fs_1.default.mkdirSync(writeDir, { recursive: true });
+            if (!fs.existsSync(writeDir)) {
+                fs.mkdirSync(writeDir, { recursive: true });
             }
-            fs_1.default.writeFileSync(finalPath, json);
+            fs.writeFileSync(finalPath, json);
             //TODO - Figure out agnostic logging
-            console.log((0, lang_1.i18n)(`${i18nKey}.converted`, {
+            console.log(i18n(`${i18nKey}.converted`, {
                 src: dirName + `/${baseName}`,
                 dest: dirName + '/fields.json',
             }));
@@ -79,19 +72,11 @@ async function fieldsArrayToJson(fields) {
     return JSON.stringify(jsonFields, null, 2);
 }
 /**
- * Takes in a path to a javascript file and either dynamically imports it or requires it, and returns, depending on node version.
+ * Takes in a path to a javascript file and dynamically imports it.
  * @param {string} filePath - Path to javascript file
- * @returns {Promise | undefined} - Returns _default_ exported content if ESM, or exported module content if CJS, or undefined if node version < 13.2 and file is .mjs.
+ * @returns {Promise} - Returns _default_ exported content if ESM, or exported module content if CJS.
  */
 async function dynamicImport(filePath) {
-    if (semver_1.default.gte(process.version, '13.2.0')) {
-        const exported = await new Function(`return import("${(0, url_1.pathToFileURL)(filePath)}")`)();
-        return exported.default;
-    }
-    else {
-        if ((0, path_2.getExt)(filePath) == 'mjs') {
-            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidMjsFile`));
-        }
-        return require(filePath);
-    }
+    const exported = await import(pathToFileURL(filePath).href);
+    return exported.default || exported;
 }

package/lib/cms/templates.js

@@ -1,20 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEMPLATE_TYPES = exports.createTemplate = exports.isCodedFile = exports.getAnnotationValue = exports.ANNOTATION_KEYS = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const github_1 = require("../github");
-const logger_1 = require("../logger");
-const lang_1 = require("../../utils/lang");
+import fs from 'fs-extra';
+import path from 'path';
+import { cloneGithubRepo } from '../github.js';
+import { logger } from '../logger.js';
+import { i18n } from '../../utils/lang.js';
 const i18nKey = 'lib.cms.templates';
 // Matches the .html file extension, excluding module.html
 const TEMPLATE_EXTENSION_REGEX = new RegExp(/(?<!module)\.html$/);
 // Matches an annotation value, ending at space, newline, or end of string
 const ANNOTATION_VALUE_REGEX = ':\\s?([\\S|\\s]*?)(\n|$)';
-exports.ANNOTATION_KEYS = {
+export const ANNOTATION_KEYS = {
     isAvailableForNewContent: 'isAvailableForNewContent',
     templateType: 'templateType',
     label: 'label',
@@ -22,20 +16,18 @@ exports.ANNOTATION_KEYS = {
     // 'description' is specific to Sections
     description: 'description',
 };
-function getAnnotationValue(annotations, key) {
+export function getAnnotationValue(annotations, key) {
     const valueRegex = new RegExp(`${key}${ANNOTATION_VALUE_REGEX}`);
     const match = annotations.match(valueRegex);
     return match ? match[1].trim() : null;
 }
-exports.getAnnotationValue = getAnnotationValue;
 /*
  * Returns true if:
  * .html extension (ignoring module.html)
  */
-function isCodedFile(filePath) {
+export function isCodedFile(filePath) {
     return TEMPLATE_EXTENSION_REGEX.test(filePath);
 }
-exports.isCodedFile = isCodedFile;
 const ASSET_PATHS = {
     'page-template': 'templates/page-template.html',
     partial: 'templates/partial.html',
@@ -46,26 +38,25 @@ const ASSET_PATHS = {
     'search-template': 'templates/search-template.html',
     section: 'templates/section.html',
 };
-async function createTemplate(name, dest, type = 'page-template', options = { allowExisting: false }) {
+export async function createTemplate(name, dest, type = 'page-template', options = { allowExisting: false }) {
     const assetPath = ASSET_PATHS[type];
     const filename = name.endsWith('.html') ? name : `${name}.html`;
-    const filePath = path_1.default.join(dest, filename);
-    if (!options.allowExisting && fs_extra_1.default.existsSync(filePath)) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.createTemplate.errors.pathExists`, {
+    const filePath = path.join(dest, filename);
+    if (!options.allowExisting && fs.existsSync(filePath)) {
+        throw new Error(i18n(`${i18nKey}.createTemplate.errors.pathExists`, {
             path: filePath,
         }));
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingPath`, { path: dest }));
-    fs_extra_1.default.mkdirp(dest);
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingFile`, {
+    logger.debug(i18n(`${i18nKey}.createTemplate.creatingPath`, { path: dest }));
+    fs.mkdirp(dest);
+    logger.log(i18n(`${i18nKey}.createTemplate.creatingFile`, {
         path: filePath,
     }));
-    await (0, github_1.cloneGithubRepo)('HubSpot/cms-sample-assets', filePath, {
+    await cloneGithubRepo('HubSpot/cms-sample-assets', filePath, {
         sourceDir: assetPath,
     });
 }
-exports.createTemplate = createTemplate;
-exports.TEMPLATE_TYPES = {
+export const TEMPLATE_TYPES = {
     unmapped: 0,
     email_base_template: 1,
     email: 2,

package/lib/cms/themes.js

@@ -1,20 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getThemePreviewUrl = exports.getThemeJSONPath = void 0;
-const findup_sync_1 = __importDefault(require("findup-sync"));
-const urls_1 = require("../urls");
-const environments_1 = require("../../constants/environments");
-const config_1 = require("../../config");
-function getThemeJSONPath(path) {
-    return (0, findup_sync_1.default)('theme.json', {
+import findup from 'findup-sync';
+import { getHubSpotWebsiteOrigin } from '../urls.js';
+import { ENVIRONMENTS } from '../../constants/environments.js';
+import { getConfigAccountEnvironment } from '../../config/index.js';
+export function getThemeJSONPath(path) {
+    return findup('theme.json', {
         cwd: path,
         nocase: true,
     });
 }
-exports.getThemeJSONPath = getThemeJSONPath;
 function getThemeNameFromPath(filePath) {
     const themeJSONPath = getThemeJSONPath(filePath);
     if (!themeJSONPath)
@@ -24,13 +17,12 @@ function getThemeNameFromPath(filePath) {
         return;
     return pathParts[pathParts.length - 2];
 }
-function getThemePreviewUrl(filePath, accountId) {
+export function getThemePreviewUrl(filePath, accountId) {
     const themeName = getThemeNameFromPath(filePath);
     if (!themeName)
         return;
-    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getConfigAccountEnvironment)(accountId) === 'qa'
-        ? environments_1.ENVIRONMENTS.QA
-        : environments_1.ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId) === 'qa'
+        ? ENVIRONMENTS.QA
+        : ENVIRONMENTS.PROD);
     return `${baseUrl}/theme-previewer/${accountId}/edit/${encodeURIComponent(themeName)}`;
 }
-exports.getThemePreviewUrl = getThemePreviewUrl;

package/lib/cms/uploadFolder.d.ts

@@ -1,7 +1,7 @@
-import { FieldsJs } from './handleFieldsJS';
-import { FileMapperInputOptions } from '../../types/Files';
-import { UploadFolderResults, CommandOptions, FilePathsByType } from '../../types/Files';
-import { CmsPublishMode } from '../../types/Files';
+import { FieldsJs } from './handleFieldsJS.js';
+import { FileMapperInputOptions } from '../../types/Files.js';
+import { UploadFolderResults, CommandOptions, FilePathsByType } from '../../types/Files.js';
+import { CmsPublishMode } from '../../types/Files.js';
 export declare function getFilesByType(filePaths: Array<string>, projectDir: string, rootWriteDir: string | null, commandOptions: CommandOptions): Promise<[FilePathsByType, Array<FieldsJs>]>;
 export declare function uploadFolder(accountId: number, src: string, dest: string, fileMapperOptions: FileMapperInputOptions, commandOptions?: CommandOptions, filePaths?: Array<string>, cmsPublishMode?: CmsPublishMode | null): Promise<Array<UploadFolderResults>>;
 export declare function hasUploadErrors(results: Array<UploadFolderResults>): boolean;

package/lib/cms/uploadFolder.js

@@ -1,59 +1,53 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasUploadErrors = exports.uploadFolder = exports.getFilesByType = void 0;
-const path_1 = __importDefault(require("path"));
-const p_queue_1 = __importDefault(require("p-queue"));
-const handleFieldsJS_1 = require("./handleFieldsJS");
-const fileMapper_1 = require("../fileMapper");
-const fileMapper_2 = require("../../api/fileMapper");
-const modules_1 = require("../../utils/cms/modules");
-const escapeRegExp_1 = require("../escapeRegExp");
-const path_2 = require("../path");
-const errors_1 = require("../../errors");
-const logger_1 = require("../logger");
-const files_1 = require("../../constants/files");
-const lang_1 = require("../../utils/lang");
-const HubSpotHttpError_1 = require("../../models/HubSpotHttpError");
+import path from 'path';
+import PQueue from 'p-queue';
+import { isConvertableFieldJs, FieldsJs, createTmpDirSync, cleanupTmpDirSync, } from './handleFieldsJS.js';
+import { getFileMapperQueryValues } from '../fileMapper.js';
+import { upload } from '../../api/fileMapper.js';
+import { isModuleFolderChild } from '../../utils/cms/modules.js';
+import { escapeRegExp } from '../escapeRegExp.js';
+import { convertToUnixPath, getExt } from '../path.js';
+import { isAuthError, isHubSpotHttpError } from '../../errors/index.js';
+import { logger } from '../logger.js';
+import { FILE_TYPES, FILE_UPLOAD_RESULT_TYPES } from '../../constants/files.js';
+import { i18n } from '../../utils/lang.js';
+import { HubSpotHttpError } from '../../models/HubSpotHttpError.js';
 const i18nKey = 'lib.cms.uploadFolder';
-const queue = new p_queue_1.default({
+const queue = new PQueue({
     concurrency: 10,
 });
 function getFileType(filePath) {
-    const extension = (0, path_2.getExt)(filePath);
-    const moduleFolder = (0, modules_1.isModuleFolderChild)({ path: filePath, isLocal: true });
+    const extension = getExt(filePath);
+    const moduleFolder = isModuleFolderChild({ path: filePath, isLocal: true });
     if (moduleFolder)
-        return files_1.FILE_TYPES.module;
+        return FILE_TYPES.module;
     switch (extension) {
         case 'js':
         case 'css':
-            return files_1.FILE_TYPES.cssAndJs;
+            return FILE_TYPES.cssAndJs;
         case 'html':
-            return files_1.FILE_TYPES.template;
+            return FILE_TYPES.template;
         case 'json':
-            return files_1.FILE_TYPES.json;
+            return FILE_TYPES.json;
         default:
-            return files_1.FILE_TYPES.other;
+            return FILE_TYPES.other;
     }
 }
 function isMetaJsonFile(filePath) {
-    return path_1.default.basename(filePath).toLowerCase() === 'meta.json';
+    return path.basename(filePath).toLowerCase() === 'meta.json';
 }
 function resolveUploadPath(file, fieldsJsPaths, tmpDirRegex, regex, dest) {
     const fieldsJsFileInfo = fieldsJsPaths.find(f => f.outputPath === file);
     const relativePath = file.replace(fieldsJsFileInfo ? tmpDirRegex : regex, '');
-    const destPath = (0, path_2.convertToUnixPath)(path_1.default.join(dest, relativePath));
+    const destPath = convertToUnixPath(path.join(dest, relativePath));
     const originalFilePath = fieldsJsFileInfo ? fieldsJsFileInfo.filePath : file;
     return { fieldsJsFileInfo, relativePath, destPath, originalFilePath };
 }
-async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOptions) {
+export async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOptions) {
     const { convertFields, fieldOptions } = commandOptions;
-    const projectDirRegex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(projectDir)}`);
+    const projectDirRegex = new RegExp(`^${escapeRegExp(projectDir)}`);
     const fieldsJsObjects = [];
     // Create object with key-value pairs of form { FileType.type: [] }
-    const filePathsByType = Object.values(files_1.FILE_TYPES).reduce((acc, fileType) => {
+    const filePathsByType = Object.values(FILE_TYPES).reduce((acc, fileType) => {
         return {
             ...acc,
             [fileType]: [],
@@ -66,10 +60,10 @@ async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOption
             filePathsByType[fileType].push(filePath);
             continue;
         }
-        const convertableFields = (0, handleFieldsJS_1.isConvertableFieldJs)(projectDir, filePath, convertFields);
+        const convertableFields = isConvertableFieldJs(projectDir, filePath, convertFields);
         if (convertableFields) {
-            const rootOrModule = path_1.default.dirname(relPath) === '/' ? files_1.FILE_TYPES.json : files_1.FILE_TYPES.module;
-            const fieldsJs = await new handleFieldsJS_1.FieldsJs(projectDir, filePath, rootWriteDir, fieldOptions).init();
+            const rootOrModule = path.dirname(relPath) === '/' ? FILE_TYPES.json : FILE_TYPES.module;
+            const fieldsJs = await new FieldsJs(projectDir, filePath, rootWriteDir, fieldOptions).init();
             /*
              * A fields.js will be rejected if the promise is rejected or if the some other error occurs.
              * We handle this gracefully by not adding the failed fields.js to the object list.
@@ -85,32 +79,31 @@ async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOption
     }
     return [filePathsByType, fieldsJsObjects];
 }
-exports.getFilesByType = getFilesByType;
-const defaultUploadAttemptCallback = (file, destPath) => logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.attempt`, {
+const defaultUploadAttemptCallback = (file, destPath) => logger.debug(i18n(`${i18nKey}.uploadFolder.attempt`, {
     file: file || '',
     destPath,
 }));
-const defaultUploadSuccessCallback = (file, destPath) => logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.uploadFolder.success`, {
+const defaultUploadSuccessCallback = (file, destPath) => logger.log(i18n(`${i18nKey}.uploadFolder.success`, {
     file: file || '',
     destPath,
 }));
 const defaultUploadFirstErrorCallback = (file, destPath, error) => {
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.failed`, { file, destPath }));
-    if ((0, errors_1.isHubSpotHttpError)(error)) {
-        logger_1.logger.debug(error.data);
+    logger.debug(i18n(`${i18nKey}.uploadFolder.failed`, { file, destPath }));
+    if (isHubSpotHttpError(error)) {
+        logger.debug(error.data);
     }
     else if (error instanceof Error) {
-        logger_1.logger.debug(error.message);
+        logger.debug(error.message);
     }
 };
-const defaultUploadRetryCallback = (file, destPath) => logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.retry`, { file, destPath }));
+const defaultUploadRetryCallback = (file, destPath) => logger.debug(i18n(`${i18nKey}.uploadFolder.retry`, { file, destPath }));
 const defaultUploadFinalErrorCallback = (accountId, file, destPath, error) => {
-    const retryFailed = (0, lang_1.i18n)(`${i18nKey}.uploadFolder.retryFailed`, {
+    const retryFailed = i18n(`${i18nKey}.uploadFolder.retryFailed`, {
         file,
         destPath,
     });
-    logger_1.logger.debug(retryFailed);
-    throw new HubSpotHttpError_1.HubSpotHttpError(retryFailed, { cause: error }, {
+    logger.debug(retryFailed);
+    throw new HubSpotHttpError(retryFailed, { cause: error }, {
         accountId,
         request: destPath,
         payload: file,
@@ -122,7 +115,7 @@ async function uploadMetaJsonFiles(moduleFiles, uploadFile) {
         await queue.addAll(moduleMetaJsonFiles.map(uploadFile));
     }
 }
-async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOptions = {}, filePaths = [], cmsPublishMode = null) {
+export async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOptions = {}, filePaths = [], cmsPublishMode = null) {
     const { saveOutput, convertFields, onAttemptCallback, onSuccessCallback, onFirstErrorCallback, onRetryCallback, onFinalErrorCallback, } = commandOptions;
     const _onAttemptCallback = onAttemptCallback || defaultUploadAttemptCallback;
     const _onSuccessCallback = onSuccessCallback || defaultUploadSuccessCallback;
@@ -130,13 +123,13 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
     const _onRetryCallback = onRetryCallback || defaultUploadRetryCallback;
     const _onFinalErrorCallback = onFinalErrorCallback || defaultUploadFinalErrorCallback;
     const tmpDir = convertFields
-        ? (0, handleFieldsJS_1.createTmpDirSync)('hubspot-temp-fieldsjs-output-')
+        ? createTmpDirSync('hubspot-temp-fieldsjs-output-')
         : null;
-    const regex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(src)}`);
-    const apiOptions = (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode, fileMapperOptions);
+    const regex = new RegExp(`^${escapeRegExp(src)}`);
+    const apiOptions = getFileMapperQueryValues(cmsPublishMode, fileMapperOptions);
     const failures = [];
     let fieldsJsPaths = [];
-    const tmpDirRegex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(tmpDir || '')}`);
+    const tmpDirRegex = new RegExp(`^${escapeRegExp(tmpDir || '')}`);
     const [filesByType, fieldsJsObjects] = await getFilesByType(filePaths, src, tmpDir, commandOptions);
     if (fieldsJsObjects.length) {
         fieldsJsPaths = fieldsJsObjects.map(fieldsJs => {
@@ -148,11 +141,11 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
         return async () => {
             _onAttemptCallback(originalFilePath, destPath);
             try {
-                await (0, fileMapper_2.upload)(accountId, file, destPath, apiOptions);
+                await upload(accountId, file, destPath, apiOptions);
                 _onSuccessCallback(originalFilePath, destPath);
             }
             catch (err) {
-                if ((0, errors_1.isAuthError)(err)) {
+                if (isAuthError(err)) {
                     throw err;
                 }
                 _onFirstErrorCallback(file, destPath, err);
@@ -164,11 +157,11 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
         };
     }
     // Upload all meta.json files first
-    await uploadMetaJsonFiles(filesByType[files_1.FILE_TYPES.module] || [], uploadFile);
+    await uploadMetaJsonFiles(filesByType[FILE_TYPES.module] || [], uploadFile);
     // Collect all remaining files for upload
     const deferredFiles = [];
     Object.entries(filesByType).forEach(([fileType, files]) => {
-        if (fileType === files_1.FILE_TYPES.module) {
+        if (fileType === FILE_TYPES.module) {
             // Add non-meta.json module files
             deferredFiles.push(...files.filter(f => !isMetaJsonFile(f)));
         }
@@ -186,21 +179,21 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
         return async () => {
             _onRetryCallback(file, destPath);
             try {
-                await (0, fileMapper_2.upload)(accountId, file, destPath, apiOptions);
+                await upload(accountId, file, destPath, apiOptions);
                 _onSuccessCallback(file, destPath);
                 return {
-                    resultType: files_1.FILE_UPLOAD_RESULT_TYPES.SUCCESS,
+                    resultType: FILE_UPLOAD_RESULT_TYPES.SUCCESS,
                     error: null,
                     file,
                 };
             }
             catch (error) {
-                if ((0, errors_1.isAuthError)(error)) {
+                if (isAuthError(error)) {
                     throw error;
                 }
                 _onFinalErrorCallback(accountId, file, destPath, error);
                 return {
-                    resultType: files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE,
+                    resultType: FILE_UPLOAD_RESULT_TYPES.FAILURE,
                     error,
                     file,
                 };
@@ -213,12 +206,10 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
         if (saveOutput) {
             fieldsJsObjects.forEach(fieldsJs => fieldsJs.saveOutput());
         }
-        (0, handleFieldsJS_1.cleanupTmpDirSync)(tmpDir || '');
+        cleanupTmpDirSync(tmpDir || '');
     });
     return results;
 }
-exports.uploadFolder = uploadFolder;
-function hasUploadErrors(results) {
-    return results.some(result => result.resultType === files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE);
+export function hasUploadErrors(results) {
+    return results.some(result => result.resultType === FILE_UPLOAD_RESULT_TYPES.FAILURE);
 }
-exports.hasUploadErrors = hasUploadErrors;

package/lib/cms/validate.d.ts

@@ -1,2 +1,2 @@
-import { LintResult } from '../../types/HublValidation';
+import { LintResult } from '../../types/HublValidation.js';
 export declare function lint(accountId: number, filepath: string, callback?: (lintResult: LintResult) => number): Promise<Array<Partial<LintResult>> | void>;

package/lib/cms/validate.js

@@ -1,24 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.lint = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const extensions_1 = require("../../constants/extensions");
-const validateHubl_1 = require("../../api/validateHubl");
-const fs_1 = require("../fs");
-const path_1 = require("../path");
-async function lint(accountId, filepath, callback) {
-    const stats = await fs_extra_1.default.stat(filepath);
-    const files = stats.isDirectory() ? await (0, fs_1.walk)(filepath) : [filepath];
+import fs from 'fs-extra';
+import { HUBL_EXTENSIONS } from '../../constants/extensions.js';
+import { validateHubl } from '../../api/validateHubl.js';
+import { walk } from '../fs.js';
+import { getExt } from '../path.js';
+export async function lint(accountId, filepath, callback) {
+    const stats = await fs.stat(filepath);
+    const files = stats.isDirectory() ? await walk(filepath) : [filepath];
     if (!(files && files.length)) {
         return [];
     }
     return Promise.all(files
-        .filter(file => extensions_1.HUBL_EXTENSIONS.has((0, path_1.getExt)(file)))
+        .filter(file => HUBL_EXTENSIONS.has(getExt(file)))
         .map(async (file) => {
-        const source = await fs_extra_1.default.readFile(file, { encoding: 'utf8' });
+        const source = await fs.readFile(file, { encoding: 'utf8' });
         if (!(source && source.trim())) {
             const result = { file, validation: null };
             if (callback) {
@@ -26,7 +20,7 @@ async function lint(accountId, filepath, callback) {
             }
             return result;
         }
-        const { data: validation } = await (0, validateHubl_1.validateHubl)(accountId, source);
+        const { data: validation } = await validateHubl(accountId, source);
         const result = {
             file,
             validation,
@@ -37,4 +31,3 @@ async function lint(accountId, filepath, callback) {
         return result;
     }));
 }
-exports.lint = lint;

package/lib/cms/watch.d.ts

@@ -1,4 +1,4 @@
 import chokidar from 'chokidar';
-import { WatchOptions, WatchErrorHandler } from '../../types/Files';
-import { UploadFolderResults } from '../../types/Files';
+import { WatchOptions, WatchErrorHandler } from '../../types/Files.js';
+import { UploadFolderResults } from '../../types/Files.js';
 export declare function watch(accountId: number, src: string, dest: string, { cmsPublishMode, remove, disableInitial, notify, commandOptions, filePaths, }: WatchOptions, postInitialUploadCallback?: ((result: Array<UploadFolderResults>) => void) | null, onUploadFolderError?: WatchErrorHandler, onQueueAddError?: WatchErrorHandler, onUploadFileError?: (file: string, dest: string, accountId: number) => WatchErrorHandler): chokidar.FSWatcher;