@hubspot/cli 7.7.21-experimental.1 → 7.7.22-experimental.0

package/lib/projects/buildAndDeploy.js

@@ -1,28 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pollDeployStatus = exports.pollBuildStatus = void 0;
-exports.useV3Api = useV3Api;
-exports.displayWarnLogs = displayWarnLogs;
-exports.pollProjectBuildAndDeploy = pollProjectBuildAndDeploy;
-const chalk_1 = __importDefault(require("chalk"));
-const projects_1 = require("@hubspot/local-dev-lib/api/projects");
-const constants_1 = require("../constants");
-const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
-const errorHandlers_1 = require("../errorHandlers");
-const ui_1 = require("../ui");
-const urls_1 = require("./urls");
-const exitCodes_1 = require("../enums/exitCodes");
-const en_1 = require("../../lang/en");
-const logger_1 = require("../ui/logger");
-const constants_2 = require("@hubspot/project-parsing-lib/src/lib/constants");
-const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+import chalk from 'chalk';
+import { getBuildStatus, getBuildStructure, getDeployStatus, getDeployStructure, fetchBuildWarnLogs, fetchDeployWarnLogs, } from '@hubspot/local-dev-lib/api/projects';
+import { DEFAULT_POLLING_DELAY, PROJECT_BUILD_TEXT, PROJECT_DEPLOY_TEXT, PROJECT_TASK_TYPES, PROJECT_ERROR_TYPES, } from '../constants.js';
+import SpinniesManager from '../ui/SpinniesManager.js';
+import { logError, ApiErrorContext } from '../errorHandlers/index.js';
+import { uiLine, uiLink, uiAccountDescription } from '../ui/index.js';
+import { getProjectBuildDetailUrl, getProjectDeployDetailUrl, getProjectActivityUrl, } from './urls.js';
+import { EXIT_CODES } from '../enums/exitCodes.js';
+import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
+import { AppFunctionsPackageKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
+import { mapToInternalType } from '@hubspot/project-parsing-lib';
 const SPINNER_STATUS = {
     SPINNING: 'spinning',
 };
-function useV3Api(platformVersion) {
+export function useV3Api(platformVersion) {
     if (!platformVersion || typeof platformVersion !== 'string') {
         return false;
     }
@@ -51,22 +42,22 @@ function getSubtaskType(task) {
     return task.deployType;
 }
 function handleTaskStatusError(statusText) {
-    logger_1.uiLogger.error(en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorFetchingTaskStatus(statusText.TYPE_KEY === constants_1.PROJECT_BUILD_TEXT.TYPE_KEY ? 'build' : 'deploy'));
-    process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    uiLogger.error(lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorFetchingTaskStatus(statusText.TYPE_KEY === PROJECT_BUILD_TEXT.TYPE_KEY ? 'build' : 'deploy'));
+    process.exit(EXIT_CODES.ERROR);
 }
 function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrings, linkToHubSpot, }) {
     return async function (accountId, taskName, taskId, deployedBuildId, silenceLogs = false) {
         const displayId = deployedBuildId || taskId;
         if (linkToHubSpot && !silenceLogs) {
-            logger_1.uiLogger.log(`\n${linkToHubSpot(accountId, taskName, taskId, deployedBuildId)}\n`);
+            uiLogger.log(`\n${linkToHubSpot(accountId, taskName, taskId, deployedBuildId)}\n`);
         }
-        SpinniesManager_1.default.init();
+        SpinniesManager.init();
         const overallTaskSpinniesKey = `overallTaskStatus-${statusText.STATUS_TEXT}`;
-        SpinniesManager_1.default.add(overallTaskSpinniesKey, {
+        SpinniesManager.add(overallTaskSpinniesKey, {
             text: 'Beginning',
             succeedColor: 'white',
             failColor: 'white',
-            failPrefix: chalk_1.default.bold('!'),
+            failPrefix: chalk.bold('!'),
         });
         const [{ data: initialTaskStatus }, { data: { topLevelComponentsWithChildren: taskStructure }, },] = await Promise.all([
             statusFn(accountId, taskName, taskId),
@@ -77,7 +68,7 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
         const tasksById = subtasks
             .filter(subtask => {
             // TODO: Remove this filtering logic when visible=false for SERVERLESS_PACKAGE
-            const shouldBeVisible = getSubtaskType(subtask) !== (0, project_parsing_lib_1.mapToInternalType)(constants_2.AppFunctionsPackageKey);
+            const shouldBeVisible = getSubtaskType(subtask) !== mapToInternalType(AppFunctionsPackageKey);
             if (!shouldBeVisible) {
                 hiddenComponentBuildIds.push(subtask.id);
             }
@@ -105,21 +96,21 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
         const componentCountText = silenceLogs
             ? ''
             : numComponents === 1
-                ? en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                ? lib.projectBuildAndDeploy.makePollTaskStatusFunc
                     .componentCountSingular
-                : en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.componentCount(numComponents);
-        SpinniesManager_1.default.update(overallTaskSpinniesKey, {
+                : lib.projectBuildAndDeploy.makePollTaskStatusFunc.componentCount(numComponents);
+        SpinniesManager.update(overallTaskSpinniesKey, {
             text: `${statusStrings.INITIALIZE(taskName, displayId)}\n${componentCountText}`,
         });
         if (!silenceLogs) {
             function addTaskSpinner(subtask, indent, newline) {
                 const taskName = getSubtaskName(subtask);
                 const taskType = getSubtaskType(subtask);
-                const formattedTaskType = constants_1.PROJECT_TASK_TYPES[taskType]
-                    ? `[${constants_1.PROJECT_TASK_TYPES[taskType]}]`
+                const formattedTaskType = PROJECT_TASK_TYPES[taskType]
+                    ? `[${PROJECT_TASK_TYPES[taskType]}]`
                     : '';
-                const text = `${indent <= 2 ? statusText.STATUS_TEXT : ''} ${chalk_1.default.bold(taskName)} ${formattedTaskType} ...${newline ? '\n' : ''}`;
-                SpinniesManager_1.default.add(subtask.id, {
+                const text = `${indent <= 2 ? statusText.STATUS_TEXT : ''} ${chalk.bold(taskName)} ${formattedTaskType} ...${newline ? '\n' : ''}`;
+                SpinniesManager.add(subtask.id, {
                     text,
                     indent,
                     succeedColor: 'white',
@@ -139,8 +130,8 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                     taskStatus = data;
                 }
                 catch (e) {
-                    logger_1.uiLogger.debug(e);
-                    (0, errorHandlers_1.logError)(e, new errorHandlers_1.ApiErrorContext({
+                    uiLogger.debug(e);
+                    logError(e, new ApiErrorContext({
                         accountId,
                         projectName: taskName,
                     }));
@@ -151,10 +142,10 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                     handleTaskStatusError(statusText);
                 }
                 const { status } = taskStatus;
-                if (SpinniesManager_1.default.hasActiveSpinners()) {
+                if (SpinniesManager.hasActiveSpinners()) {
                     subtasks.forEach(subtask => {
                         const { id, status } = subtask;
-                        const spinner = SpinniesManager_1.default.pick(id);
+                        const spinner = SpinniesManager.pick(id);
                         if (!spinner || spinner.status !== SPINNER_STATUS.SPINNING) {
                             return;
                         }
@@ -162,54 +153,54 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         if (status === statusText.STATES.SUCCESS ||
                             status === statusText.STATES.FAILURE) {
                             const taskStatusText = subtask.status === statusText.STATES.SUCCESS
-                                ? en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                                ? lib.projectBuildAndDeploy.makePollTaskStatusFunc
                                     .successStatusText
-                                : en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                                : lib.projectBuildAndDeploy.makePollTaskStatusFunc
                                     .failedStatusText;
                             const hasNewline = spinner?.text?.includes('\n') || Boolean(topLevelTask);
                             const updatedText = `${spinner?.text?.replace('\n', '')} ${taskStatusText}${hasNewline ? '\n' : ''}`;
                             if (status === statusText.STATES.SUCCESS) {
-                                SpinniesManager_1.default.succeed(id, { text: updatedText });
+                                SpinniesManager.succeed(id, { text: updatedText });
                             }
                             else {
-                                SpinniesManager_1.default.fail(id, { text: updatedText });
+                                SpinniesManager.fail(id, { text: updatedText });
                             }
                             if (topLevelTask) {
-                                topLevelTask.subtasks.forEach(currentSubtask => SpinniesManager_1.default.remove(currentSubtask.id));
+                                topLevelTask.subtasks.forEach(currentSubtask => SpinniesManager.remove(currentSubtask.id));
                             }
                         }
                     });
                     if (status === statusText.STATES.SUCCESS) {
-                        SpinniesManager_1.default.succeed(overallTaskSpinniesKey, {
+                        SpinniesManager.succeed(overallTaskSpinniesKey, {
                             text: statusStrings.SUCCESS(taskName, displayId),
                         });
                         clearInterval(pollInterval);
                         resolve(taskStatus);
                     }
                     else if (status === statusText.STATES.FAILURE) {
-                        SpinniesManager_1.default.fail(overallTaskSpinniesKey, {
+                        SpinniesManager.fail(overallTaskSpinniesKey, {
                             text: statusStrings.FAIL(taskName, displayId),
                         });
                         if (!silenceLogs) {
                             const failedSubtasks = subtasks.filter(subtask => subtask.status === 'FAILURE');
-                            (0, ui_1.uiLine)();
-                            logger_1.uiLogger.log(`${statusStrings.SUBTASK_FAIL(failedSubtasks.length === 1
+                            uiLine();
+                            uiLogger.log(`${statusStrings.SUBTASK_FAIL(failedSubtasks.length === 1
                                 ? getSubtaskName(failedSubtasks[0])
                                 : failedSubtasks.length + ' components', displayId)}\n`);
-                            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorSummary);
-                            (0, ui_1.uiLine)();
+                            uiLogger.log(lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorSummary);
+                            uiLine();
                             const displayErrors = failedSubtasks.filter(subtask => subtask?.standardError?.subCategory !==
-                                constants_1.PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
+                                PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
                                 subtask?.standardError?.subCategory !==
-                                    constants_1.PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED);
+                                    PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED);
                             displayErrors.forEach(subTask => {
-                                logger_1.uiLogger.log(`\n--- ${chalk_1.default.bold(getSubtaskName(subTask))} failed with the following error ---`);
-                                logger_1.uiLogger.error(subTask.errorMessage);
+                                uiLogger.log(`\n--- ${chalk.bold(getSubtaskName(subTask))} failed with the following error ---`);
+                                uiLogger.error(subTask.errorMessage);
                                 // Log nested errors
                                 if (subTask.standardError && subTask.standardError.errors) {
-                                    logger_1.uiLogger.log('');
+                                    uiLogger.log('');
                                     subTask.standardError.errors.forEach(error => {
-                                        logger_1.uiLogger.log(error.message);
+                                        uiLogger.log(error.message);
                                     });
                                 }
                             });
@@ -222,25 +213,25 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         resolve(taskStatus);
                     }
                 }
-            }, constants_1.DEFAULT_POLLING_DELAY);
+            }, DEFAULT_POLLING_DELAY);
         });
     };
 }
 function pollBuildAutodeployStatus(accountId, taskName, buildId) {
     return new Promise((resolve, reject) => {
-        let maxIntervals = (15 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~15s
+        let maxIntervals = (15 * 1000) / DEFAULT_POLLING_DELAY; // Num of intervals in ~15s
         const pollInterval = setInterval(async () => {
             let build;
             try {
-                const response = await (0, projects_1.getBuildStatus)(accountId, taskName, buildId);
+                const response = await getBuildStatus(accountId, taskName, buildId);
                 build = response.data;
             }
             catch (e) {
-                logger_1.uiLogger.debug(e);
-                return reject(new Error(en_1.lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
+                uiLogger.debug(e);
+                return reject(new Error(lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
             }
             if (!build || !build.status) {
-                return reject(new Error(en_1.lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
+                return reject(new Error(lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
             }
             if (build.deployStatusTaskLocator || maxIntervals <= 0) {
                 clearInterval(pollInterval);
@@ -249,67 +240,67 @@ function pollBuildAutodeployStatus(accountId, taskName, buildId) {
             else {
                 maxIntervals -= 1;
             }
-        }, constants_1.DEFAULT_POLLING_DELAY);
+        }, DEFAULT_POLLING_DELAY);
     });
 }
-exports.pollBuildStatus = makePollTaskStatusFunc({
-    linkToHubSpot: (accountId, taskName, taskId) => (0, ui_1.uiLink)(`View build #${taskId} in HubSpot`, (0, urls_1.getProjectBuildDetailUrl)(taskName, taskId, accountId)),
-    statusFn: projects_1.getBuildStatus,
-    structureFn: projects_1.getBuildStructure,
-    statusText: constants_1.PROJECT_BUILD_TEXT,
+export const pollBuildStatus = makePollTaskStatusFunc({
+    linkToHubSpot: (accountId, taskName, taskId) => uiLink(`View build #${taskId} in HubSpot`, getProjectBuildDetailUrl(taskName, taskId, accountId)),
+    statusFn: getBuildStatus,
+    structureFn: getBuildStructure,
+    statusText: PROJECT_BUILD_TEXT,
     statusStrings: {
-        INITIALIZE: (name, buildId) => `Building ${chalk_1.default.bold(name)} #${buildId}`,
-        SUCCESS: (name, buildId) => `Built ${chalk_1.default.bold(name)} #${buildId}`,
-        FAIL: (name, buildId) => `Failed to build ${chalk_1.default.bold(name)} #${buildId}`,
-        SUBTASK_FAIL: (buildId, name) => `Build #${buildId} failed because there was a problem\nbuilding ${chalk_1.default.bold(name)}`,
+        INITIALIZE: (name, buildId) => `Building ${chalk.bold(name)} #${buildId}`,
+        SUCCESS: (name, buildId) => `Built ${chalk.bold(name)} #${buildId}`,
+        FAIL: (name, buildId) => `Failed to build ${chalk.bold(name)} #${buildId}`,
+        SUBTASK_FAIL: (buildId, name) => `Build #${buildId} failed because there was a problem\nbuilding ${chalk.bold(name)}`,
     },
 });
-exports.pollDeployStatus = makePollTaskStatusFunc({
-    linkToHubSpot: (accountId, taskName, taskId, deployedBuildId) => (0, ui_1.uiLink)(`View deploy of build #${deployedBuildId} in HubSpot`, (0, urls_1.getProjectDeployDetailUrl)(taskName, taskId, accountId)),
-    statusFn: projects_1.getDeployStatus,
-    structureFn: projects_1.getDeployStructure,
-    statusText: constants_1.PROJECT_DEPLOY_TEXT,
+export const pollDeployStatus = makePollTaskStatusFunc({
+    linkToHubSpot: (accountId, taskName, taskId, deployedBuildId) => uiLink(`View deploy of build #${deployedBuildId} in HubSpot`, getProjectDeployDetailUrl(taskName, taskId, accountId)),
+    statusFn: getDeployStatus,
+    structureFn: getDeployStructure,
+    statusText: PROJECT_DEPLOY_TEXT,
     statusStrings: {
-        INITIALIZE: (name, buildId) => `Deploying build #${buildId} in ${chalk_1.default.bold(name)}`,
-        SUCCESS: (name, buildId) => `Deployed build #${buildId} in ${chalk_1.default.bold(name)}`,
-        FAIL: (name, buildId) => `Failed to deploy build #${buildId} in ${chalk_1.default.bold(name)}`,
-        SUBTASK_FAIL: (deployedBuildId, name) => `Deploy for build #${deployedBuildId} failed because there was a\nproblem deploying ${chalk_1.default.bold(name)}`,
+        INITIALIZE: (name, buildId) => `Deploying build #${buildId} in ${chalk.bold(name)}`,
+        SUCCESS: (name, buildId) => `Deployed build #${buildId} in ${chalk.bold(name)}`,
+        FAIL: (name, buildId) => `Failed to deploy build #${buildId} in ${chalk.bold(name)}`,
+        SUBTASK_FAIL: (deployedBuildId, name) => `Deploy for build #${deployedBuildId} failed because there was a\nproblem deploying ${chalk.bold(name)}`,
     },
 });
-async function displayWarnLogs(accountId, projectName, taskId, isDeploy = false) {
+export async function displayWarnLogs(accountId, projectName, taskId, isDeploy = false) {
     let result;
     if (isDeploy) {
         try {
-            const { data } = await (0, projects_1.fetchDeployWarnLogs)(accountId, projectName, taskId);
+            const { data } = await fetchDeployWarnLogs(accountId, projectName, taskId);
             result = data;
         }
         catch (e) {
-            (0, errorHandlers_1.logError)(e);
+            logError(e);
         }
     }
     else {
         try {
-            const { data } = await (0, projects_1.fetchBuildWarnLogs)(accountId, projectName, taskId);
+            const { data } = await fetchBuildWarnLogs(accountId, projectName, taskId);
             result = data;
         }
         catch (e) {
-            (0, errorHandlers_1.logError)(e);
+            logError(e);
         }
     }
     if (result && result.logs) {
         const logLength = result.logs.length;
         result.logs.forEach((log, i) => {
-            logger_1.uiLogger.warn(log.message);
+            uiLogger.warn(log.message);
             if (i < logLength - 1) {
-                logger_1.uiLogger.log('');
+                uiLogger.log('');
             }
         });
     }
 }
-async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, silenceLogs = false) {
-    let buildStatus = await (0, exports.pollBuildStatus)(accountId, projectConfig.name, buildId, null, silenceLogs);
+export async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, silenceLogs = false) {
+    let buildStatus = await pollBuildStatus(accountId, projectConfig.name, buildId, null, silenceLogs);
     if (!silenceLogs) {
-        (0, ui_1.uiLine)();
+        uiLine();
     }
     const result = {
         succeeded: true,
@@ -323,7 +314,7 @@ async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, bui
     }
     else if (buildStatus.isAutoDeployEnabled) {
         if (!silenceLogs) {
-            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.buildSucceededAutomaticallyDeploying(buildId, (0, ui_1.uiAccountDescription)(accountId)));
+            uiLogger.log(lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.buildSucceededAutomaticallyDeploying(buildId, uiAccountDescription(accountId)));
             await displayWarnLogs(accountId, projectConfig.name, buildId);
         }
         // autoDeployId of 0 indicates a skipped deploy
@@ -333,24 +324,24 @@ async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, bui
             buildStatus = await pollBuildAutodeployStatus(accountId, projectConfig.name, buildId);
         }
         if (getIsDeploying()) {
-            const deployStatus = await (0, exports.pollDeployStatus)(accountId, projectConfig.name, Number(buildStatus.deployStatusTaskLocator.id), buildId, silenceLogs);
+            const deployStatus = await pollDeployStatus(accountId, projectConfig.name, Number(buildStatus.deployStatusTaskLocator.id), buildId, silenceLogs);
             result.deployResult = deployStatus;
             if (deployStatus.status === 'FAILURE') {
                 result.succeeded = false;
             }
         }
         else if (!silenceLogs) {
-            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.unableToFindAutodeployStatus(buildId, (0, ui_1.uiLink)(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.viewDeploys, (0, urls_1.getProjectActivityUrl)(projectConfig.name, accountId))));
+            uiLogger.log(lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.unableToFindAutodeployStatus(buildId, uiLink(lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.viewDeploys, getProjectActivityUrl(projectConfig.name, accountId))));
         }
     }
     try {
         if (tempFile) {
             tempFile.removeCallback();
-            logger_1.uiLogger.debug(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.cleanedUpTempFile(tempFile.name));
+            uiLogger.debug(lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.cleanedUpTempFile(tempFile.name));
         }
     }
     catch (e) {
-        (0, errorHandlers_1.logError)(e);
+        logError(e);
     }
     if (result && result.deployResult) {
         await displayWarnLogs(accountId, projectConfig.name, result.deployResult.deployId, true);

package/lib/projects/components.js

@@ -1,22 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleComponentCollision = handleComponentCollision;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+import path from 'path';
+import fs from 'fs';
+import { metafileExtension } from '@hubspot/project-parsing-lib';
 // Handles a collision between component source files
-function handleComponentCollision({ dest, src, collisions }) {
+export function handleComponentCollision({ dest, src, collisions }) {
     const hsMetaFiles = [];
     const packageJsonFiles = [];
     const sourceFiles = [];
     collisions.forEach(collision => {
-        if (collision.endsWith(project_parsing_lib_1.metafileExtension)) {
+        if (collision.endsWith(metafileExtension)) {
             hsMetaFiles.push(collision);
         }
-        else if (path_1.default.parse(collision).base === 'package.json') {
+        else if (path.parse(collision).base === 'package.json') {
             packageJsonFiles.push(collision);
         }
         else {
@@ -24,18 +18,18 @@ function handleComponentCollision({ dest, src, collisions }) {
         }
     });
     const sourceFilenameMapping = sourceFiles.reduce((acc, filename) => {
-        const { name, ext, dir } = path_1.default.parse(filename);
+        const { name, ext, dir } = path.parse(filename);
         return {
             ...acc,
-            [filename]: path_1.default.join(dir, `${name}-${Date.now()}${ext}`),
+            [filename]: path.join(dir, `${name}-${Date.now()}${ext}`),
         };
     }, {});
-    const metafileExtensionPrefix = path_1.default.parse(project_parsing_lib_1.metafileExtension).name;
+    const metafileExtensionPrefix = path.parse(metafileExtension).name;
     const metaFilenameMapping = hsMetaFiles.reduce((acc, filename) => {
-        const { name, dir } = path_1.default.parse(filename);
+        const { name, dir } = path.parse(filename);
         return {
             ...acc,
-            [filename]: path_1.default.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${Date.now()}${project_parsing_lib_1.metafileExtension}`),
+            [filename]: path.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${Date.now()}${metafileExtension}`),
         };
     }, {});
     // Update the metafiles that might contain references to the old filenames
@@ -50,25 +44,25 @@ function handleComponentCollision({ dest, src, collisions }) {
     });
     // Copy the renamed files into their new destination location
     Object.entries(sourceFilenameMapping).forEach(([key, value]) => {
-        fs_1.default.copyFileSync(path_1.default.join(src, key), path_1.default.join(dest, value));
+        fs.copyFileSync(path.join(src, key), path.join(dest, value));
     });
     if (packageJsonFiles.length) {
         handlePackageJsonCollisions(dest, src, packageJsonFiles);
     }
 }
 function updateMetaFile({ dest, src, file, sourceFilenameMapping, metaFilenameMapping, }) {
-    let text = fs_1.default.readFileSync(path_1.default.join(src, file), 'utf-8');
+    let text = fs.readFileSync(path.join(src, file), 'utf-8');
     Object.entries(sourceFilenameMapping).forEach(([key, value]) => {
-        const { base: oldFileName } = path_1.default.parse(key);
-        const { base: newFileName } = path_1.default.parse(value);
+        const { base: oldFileName } = path.parse(key);
+        const { base: newFileName } = path.parse(value);
         text = text.replace(oldFileName, newFileName);
     });
-    fs_1.default.writeFileSync(path_1.default.join(dest, metaFilenameMapping[file]), text);
+    fs.writeFileSync(path.join(dest, metaFilenameMapping[file]), text);
 }
 function handlePackageJsonCollisions(dest, src, packageJsonFiles) {
     packageJsonFiles.forEach(file => {
-        const existingPackageJsonContents = JSON.parse(fs_1.default.readFileSync(path_1.default.join(dest, file), 'utf-8'));
-        const newPackageJsonContents = JSON.parse(fs_1.default.readFileSync(path_1.default.join(src, file), 'utf-8'));
+        const existingPackageJsonContents = JSON.parse(fs.readFileSync(path.join(dest, file), 'utf-8'));
+        const newPackageJsonContents = JSON.parse(fs.readFileSync(path.join(src, file), 'utf-8'));
         existingPackageJsonContents.dependencies = {
             ...newPackageJsonContents.dependencies,
             ...existingPackageJsonContents.dependencies,
@@ -77,6 +71,6 @@ function handlePackageJsonCollisions(dest, src, packageJsonFiles) {
             ...newPackageJsonContents.devDependencies,
             ...existingPackageJsonContents.devDependencies,
         };
-        fs_1.default.writeFileSync(path_1.default.join(dest, file), JSON.stringify(existingPackageJsonContents, null, 2));
+        fs.writeFileSync(path.join(dest, file), JSON.stringify(existingPackageJsonContents, null, 2));
     });
 }

package/lib/projects/config.d.ts

@@ -1,4 +1,4 @@
-import { ProjectConfig } from '../../types/Projects';
+import { ProjectConfig } from '../../types/Projects.js';
 export declare function writeProjectConfig(configPath: string, config: ProjectConfig): boolean;
 export declare function getIsInProject(dir?: string): boolean;
 export interface LoadedProjectConfig {

package/lib/projects/config.js

@@ -1,79 +1,70 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeProjectConfig = writeProjectConfig;
-exports.getIsInProject = getIsInProject;
-exports.getProjectConfig = getProjectConfig;
-exports.validateProjectConfig = validateProjectConfig;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const findup_sync_1 = __importDefault(require("findup-sync"));
-const path_2 = require("@hubspot/local-dev-lib/path");
-const constants_1 = require("../constants");
-const en_1 = require("../../lang/en");
-const exitCodes_1 = require("../enums/exitCodes");
-const logger_1 = require("../ui/logger");
-function writeProjectConfig(configPath, config) {
+import fs from 'fs-extra';
+import path from 'path';
+import findup from 'findup-sync';
+import { getAbsoluteFilePath, getCwd } from '@hubspot/local-dev-lib/path';
+import { PROJECT_CONFIG_FILE } from '../constants.js';
+import { lib } from '../../lang/en.js';
+import { EXIT_CODES } from '../enums/exitCodes.js';
+import { uiLogger } from '../ui/logger.js';
+export function writeProjectConfig(configPath, config) {
     try {
-        fs_extra_1.default.ensureFileSync(configPath);
-        fs_extra_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
-        logger_1.uiLogger.debug(`Wrote project config at ${configPath}`);
+        fs.ensureFileSync(configPath);
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        uiLogger.debug(`Wrote project config at ${configPath}`);
     }
     catch (e) {
-        logger_1.uiLogger.debug(e);
+        uiLogger.debug(e);
         return false;
     }
     return true;
 }
-function getIsInProject(dir) {
+export function getIsInProject(dir) {
     const configPath = getProjectConfigPath(dir);
     return !!configPath;
 }
 function getProjectConfigPath(dir) {
-    const projectDir = dir ? (0, path_2.getAbsoluteFilePath)(dir) : (0, path_2.getCwd)();
-    const configPath = (0, findup_sync_1.default)(constants_1.PROJECT_CONFIG_FILE, {
+    const projectDir = dir ? getAbsoluteFilePath(dir) : getCwd();
+    const configPath = findup(PROJECT_CONFIG_FILE, {
         cwd: projectDir,
         nocase: true,
     });
     return configPath;
 }
-async function getProjectConfig(dir) {
+export async function getProjectConfig(dir) {
     const configPath = getProjectConfigPath(dir);
     if (!configPath) {
         return { projectConfig: null, projectDir: null };
     }
     try {
-        const config = fs_extra_1.default.readFileSync(configPath);
+        const config = fs.readFileSync(configPath);
         const projectConfig = JSON.parse(config.toString());
         return {
-            projectDir: path_1.default.dirname(configPath),
+            projectDir: path.dirname(configPath),
             projectConfig,
         };
     }
     catch (e) {
-        logger_1.uiLogger.error(en_1.lib.projects.getProjectConfig.error);
+        uiLogger.error(lib.projects.getProjectConfig.error);
         return { projectConfig: null, projectDir: null };
     }
 }
-function validateProjectConfig(projectConfig, projectDir) {
+export function validateProjectConfig(projectConfig, projectDir) {
     if (!projectConfig || !projectDir) {
-        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.configNotFound);
-        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        uiLogger.error(lib.projects.validateProjectConfig.configNotFound);
+        return process.exit(EXIT_CODES.ERROR);
     }
     if (!projectConfig.name || !projectConfig.srcDir) {
-        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.configMissingFields);
-        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        uiLogger.error(lib.projects.validateProjectConfig.configMissingFields);
+        return process.exit(EXIT_CODES.ERROR);
     }
-    const resolvedPath = path_1.default.resolve(projectDir, projectConfig.srcDir);
+    const resolvedPath = path.resolve(projectDir, projectConfig.srcDir);
     if (!resolvedPath.startsWith(projectDir)) {
-        const projectConfigFile = path_1.default.relative('.', path_1.default.join(projectDir, constants_1.PROJECT_CONFIG_FILE));
-        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.srcOutsideProjectDir(projectConfigFile, projectConfig.srcDir));
-        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        const projectConfigFile = path.relative('.', path.join(projectDir, PROJECT_CONFIG_FILE));
+        uiLogger.error(lib.projects.validateProjectConfig.srcOutsideProjectDir(projectConfigFile, projectConfig.srcDir));
+        return process.exit(EXIT_CODES.ERROR);
     }
-    if (!fs_extra_1.default.existsSync(resolvedPath)) {
-        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.srcDirNotFound(projectConfig.srcDir, projectDir));
-        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (!fs.existsSync(resolvedPath)) {
+        uiLogger.error(lib.projects.validateProjectConfig.srcDirNotFound(projectConfig.srcDir, projectDir));
+        return process.exit(EXIT_CODES.ERROR);
     }
 }