@hubspot/project-parsing-lib 0.8.5 → 0.8.6-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/project-parsing-lib",
-    "version": "0.8.5",
+    "version": "0.8.6-beta.0",
     "description": "Parsing library for converting projects directory structures to their intermediate representation",
     "license": "Apache-2.0",
     "main": "src/index.js",

package/src/lib/files.d.ts

@@ -10,3 +10,4 @@ export declare function locateHsMetaFiles(projectSourceDir: string, options?: {
     silent: boolean;
 }): Promise<MetaFileLocation[]>;
 export declare function projectContainsHsMetaFiles(projectSourceDir: string): Promise<boolean>;
+export declare function convertPathToPosixPath(filepath: string): string;

package/src/lib/files.js

@@ -8,6 +8,7 @@ exports.getAllHsProfiles = getAllHsProfiles;
 exports.loadHsMetaFiles = loadHsMetaFiles;
 exports.locateHsMetaFiles = locateHsMetaFiles;
 exports.projectContainsHsMetaFiles = projectContainsHsMetaFiles;
+exports.convertPathToPosixPath = convertPathToPosixPath;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fs_2 = require("@hubspot/local-dev-lib/fs");
@@ -112,3 +113,6 @@ async function projectContainsHsMetaFiles(projectSourceDir) {
     const hsMetaFiles = (await (0, fs_2.walk)(projectSourceDir, ['node_modules'])).filter(file => file.endsWith(constants_1.metafileExtension));
     return hsMetaFiles.length > 0;
 }
+function convertPathToPosixPath(filepath) {
+    return filepath.replaceAll(path_1.default.win32.sep, path_1.default.posix.sep);
+}

package/src/lib/transform.js

@@ -16,6 +16,7 @@ const profiles_1 = require("./profiles");
 const constants_1 = require("./constants");
 const copy_1 = require("../lang/copy");
 const utils_1 = require("./utils");
+const files_1 = require("./files");
 function calculateComponentDeps(fileValidationResult, parentComponents, appObjects, appFunctionsPackageUid) {
     let dependencies = {};
     // If there are dependencies in the config file, pass them through
@@ -113,7 +114,7 @@ function transform(fileParseResults, translationContext, hsProfileContents) {
                 config,
                 componentType: mapToInternalType(type),
                 componentDeps: dependencies,
-                metaFilePath: currentFile.file,
+                metaFilePath: (0, files_1.convertPathToPosixPath)(currentFile.file),
                 files: {},
             },
             fileParseResult: currentFile,
@@ -184,10 +185,11 @@ function getProfileData(hsProfileContents) {
     return { vars: { profileVariables: profileVariablesForBE } };
 }
 function generateServerlessPackageComponent(appFunctionsDirectory, translationContext, componentDeps) {
-    const packageFile = path_1.default.join(appFunctionsDirectory, constants_1.packageJson);
-    const packageLockFile = path_1.default.join(appFunctionsDirectory, constants_1.packageLockJson);
-    const { projectSourceDir } = translationContext;
-    const appFunctionsPackageFile = path_1.default.join(projectSourceDir, packageFile);
+    const appFunctionsPosix = (0, files_1.convertPathToPosixPath)(appFunctionsDirectory);
+    const packageFilePosix = path_1.default.posix.join(appFunctionsPosix, constants_1.packageJson);
+    const packageLockFilePosix = path_1.default.posix.join(appFunctionsPosix, constants_1.packageLockJson);
+    const projectSourceDirPosix = (0, files_1.convertPathToPosixPath)(translationContext.projectSourceDir);
+    const appFunctionsPackageFile = path_1.default.posix.join(projectSourceDirPosix, packageFilePosix);
     if (!fs_1.default.existsSync(appFunctionsPackageFile)) {
         throw new Error(copy_1.errorMessages.project.noPackageJsonForServerless(appFunctionsPackageFile));
     }
@@ -203,13 +205,15 @@ function generateServerlessPackageComponent(appFunctionsDirectory, translationCo
                 uid,
                 componentType: mapToInternalType(constants_1.AppFunctionsPackageKey),
                 config: {
-                    packageFile,
-                    packageLockfile: fs_1.default.existsSync(path_1.default.join(projectSourceDir, packageLockFile))
-                        ? packageLockFile
+                    packageFile: packageFilePosix,
+                    packageLockfile: fs_1.default.existsSync(
+                    // Don't use posix here because we are checking the file system
+                    path_1.default.join(translationContext.projectSourceDir, path_1.default.join(appFunctionsDirectory, constants_1.packageLockJson)))
+                        ? packageLockFilePosix
                         : undefined,
                 },
                 componentDeps,
-                metaFilePath: packageFile,
+                metaFilePath: packageFilePosix,
                 files: {},
             },
         },