Fix issue #435

Author: gregmagolan

npm/private/npm_translate_lock.bzl

@@ -543,7 +543,10 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library")"""]
         version = package_info.get("version")
         deps = package_info.get("dependencies")
         if version.startswith("file:"):
-            dep_path = _link_package(root_package, version[len("file:"):])
+            if version in packages and packages[version]["id"]:
+                dep_path = _link_package(root_package, packages[version]["id"][len("file:"):])
+            else:
+                dep_path = _link_package(root_package, version[len("file:"):])
             dep_key = "{}+{}".format(name, version)
             transitive_deps = {}
             for raw_package, raw_version in deps.items():
@@ -589,7 +592,10 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library")"""]
         link_package = _link_package(root_package, import_path)
         for dep_package, dep_version in dependencies.items():
             if dep_version.startswith("file:"):
-                dep_path = _link_package(root_package, dep_version[len("file:"):])
+                if dep_version in packages and packages[dep_version]["id"]:
+                    dep_path = _link_package(root_package, packages[dep_version]["id"][len("file:"):])
+                else:
+                    dep_path = _link_package(root_package, dep_version[len("file:"):])
                 dep_key = "{}+{}".format(dep_package, dep_version)
                 if not dep_key in fp_links.keys():
                     fail("Expected to file: referenced package {} in first-party links".format(dep_key))

npm/private/transitive_closure.bzl

@@ -40,7 +40,12 @@ def gather_transitive_closure(packages, no_optional, direct_deps, transitive_clo
             if version in transitive_closure[name]:
                 continue
             transitive_closure[name].insert(0, version)
-            package_info = packages[package_key]
+            if package_key.startswith("link:"):
+                # we don't need to drill down through first-party links for the transitive closure since there are no cycles
+                # allowed in first-party links
+                continue
+            else:
+                package_info = packages[package_key]
             stack.append(package_info["dependencies"] if no_optional else dicts.add(package_info["dependencies"], package_info["optionalDependencies"]))
 
 def _gather_package_info(package_path, package_snapshot):
@@ -71,6 +76,7 @@ def _gather_package_info(package_path, package_snapshot):
 
     if "resolution" not in package_snapshot:
         fail("package %s has no resolution field" % package_path)
+    id = package_snapshot["id"] if "id" in package_snapshot else None
     resolution = package_snapshot["resolution"]
     integrity = resolution["integrity"] if "integrity" in resolution else None
     tarball = resolution["tarball"] if "tarball" in resolution else None
@@ -81,6 +87,7 @@ def _gather_package_info(package_path, package_snapshot):
 
     return package_key, {
         "name": name,
+        "id": id,
         "version": version,
         "friendly_version": friendly_version,
         "integrity": integrity,