fix: normalize module path passed to runfiles helper for robustness

bazel-contrib · Nov 22, 2021 · c9ccd21 · c9ccd21
1 parent 85094e4
commit c9ccd21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/internal/runfiles/index.js b/internal/runfiles/index.js
@@ -130,6 +130,9 @@ class Runfiles {
     }
     /** Resolves the given module path. */
     resolve(modulePath) {
+        // Normalize path by converting to forward slashes and removing all trailing
+        // forward slashes
+        modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '');
         if (path__default['default'].isAbsolute(modulePath)) {
             return modulePath;
         }
@@ -143,13 +146,19 @@ class Runfiles {
     }
     /** Resolves the given path relative to the current Bazel workspace. */
     resolveWorkspaceRelative(modulePath) {
+        // Normalize path by converting to forward slashes and removing all trailing
+        // forward slashes
+        modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '');
         if (!this.workspace) {
             throw new Error('workspace could not be determined from the environment; make sure BAZEL_WORKSPACE is set');
         }
         return this.resolve(path__default['default'].posix.join(this.workspace, modulePath));
     }
     /** Resolves the given path relative to the current Bazel package. */
     resolvePackageRelative(modulePath) {
+        // Normalize path by converting to forward slashes and removing all trailing
+        // forward slashes
+        modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '');
         if (!this.workspace) {
             throw new Error('workspace could not be determined from the environment; make sure BAZEL_WORKSPACE is set');
         }

diff --git a/packages/runfiles/runfiles.ts b/packages/runfiles/runfiles.ts
@@ -114,6 +114,9 @@ export class Runfiles {
 
   /** Resolves the given module path. */
   resolve(modulePath: string) {
+    // Normalize path by converting to forward slashes and removing all trailing
+    // forward slashes
+    modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '')
     if (path.isAbsolute(modulePath)) {
       return modulePath;
     }
@@ -128,6 +131,9 @@ export class Runfiles {
 
   /** Resolves the given path relative to the current Bazel workspace. */
   resolveWorkspaceRelative(modulePath: string) {
+    // Normalize path by converting to forward slashes and removing all trailing
+    // forward slashes
+    modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '')
     if (!this.workspace) {
       throw new Error(
         'workspace could not be determined from the environment; make sure BAZEL_WORKSPACE is set');
@@ -137,6 +143,9 @@ export class Runfiles {
 
   /** Resolves the given path relative to the current Bazel package. */
   resolvePackageRelative(modulePath: string) {
+    // Normalize path by converting to forward slashes and removing all trailing
+    // forward slashes
+    modulePath = modulePath.replace(/\\/g, '/').replace(/\/+$/g, '')
     if (!this.workspace) {
       throw new Error(
         'workspace could not be determined from the environment; make sure BAZEL_WORKSPACE is set');