Prevent double forward slash from creeping into module_mappings when label.package is empty.
Closes #186
PiperOrigin-RevId: 194593146
diff --git a/internal/common/module_mappings.bzl b/internal/common/module_mappings.bzl
index d686475..7e63213 100644
--- a/internal/common/module_mappings.bzl
+++ b/internal/common/module_mappings.bzl
@@ -70,11 +70,10 @@
mn = attrs.module_name
if not mn:
mn = label.name
- mr = label.package
- if workspace_name:
- mr = "%s/%s" % (workspace_name, mr)
- elif label.workspace_root:
- mr = "%s/%s" % (label.workspace_root, mr)
+ mr = "/".join([p for p in [
+ workspace_name or label.workspace_root,
+ label.package
+ ] if p])
if attrs.module_root and attrs.module_root != ".":
mr = "%s/%s" % (mr, attrs.module_root)
if attrs.module_root.endswith(".ts"):
