refactor: use strict dict property access on known structs (#2471) (#2472)

Cherry-picking from v3 branch

### Changes are visible to end-users: no

### Test plan

- Covered by existing test cases

Author: jbedard

npm/private/npm_translate_lock_generate.bzl

@@ -96,12 +96,12 @@ js_binary(name = "sync", entry_point = "noop.js")
     # Collect first-party file: links in packages
     fp_links = {}
     for package_info in packages.values():
-        name = package_info.get("name")
-        version = package_info.get("version")
-        deps = package_info.get("dependencies")
-        resolution = package_info.get("resolution")
+        name = package_info["name"]
+        version = package_info["version"]
+        deps = package_info["dependencies"]
+        resolution = package_info["resolution"]
         if resolution.get("type", None) == "directory":
-            dep_path = helpers.link_package(root_package, resolution.get("directory"))
+            dep_path = helpers.link_package(root_package, resolution["directory"])
             dep_key = "{}+{}".format(name, version)
             transitive_deps = {}
             for raw_package, raw_version in deps.items():
@@ -158,7 +158,7 @@ js_binary(name = "sync", entry_point = "noop.js")
                     transitive_deps = {}
                     raw_deps = {}
                     if importers.get(dep_link, False):
-                        raw_deps = importers.get(dep_link).get("deps")
+                        raw_deps = importers.get(dep_link)["deps"]
                     for raw_package, raw_version in raw_deps.items():
                         package_store_name = utils.package_store_name(raw_package, raw_version)
                         dep_store_target = """"//{root_package}:{package_store_root}/{{}}/{package_store_name}".format(name)""".format(
@@ -173,8 +173,17 @@ js_binary(name = "sync", entry_point = "noop.js")
 
                     for dep_store_target in transitive_deps.keys():
                         transitive_deps[dep_store_target] = ",".join(transitive_deps[dep_store_target])
+
+                    # note this is the (first) name used to reference this package and not
+                    # necessarily the proper self-declared packge name
+                    package = dep_package
+
+                    # rules_js using 0.0.0 to indicate local first-party packages
+                    version = "0.0.0"
+
                     fp_links[dep_key] = {
-                        "package": dep_package,
+                        "package": package,
+                        "version": version,
                         "path": dep_path,
                         "link_packages": {},
                         "deps": transitive_deps,
@@ -318,7 +327,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = [], prod = Tru
                 rctx_files[build_file].append("exports_files([\"{}\"])".format(resolved_json_rel_path))
 
             # the package_json.bzl for this package
-            if _import.package_info.get("has_bin"):
+            if _import.package_info["has_bin"]:
                 if rctx.attr.generate_bzl_library_targets:
                     rctx_files[build_file].append("""load("@bazel_skylib//:bzl_library.bzl", "bzl_library")""")
 
@@ -349,10 +358,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = [], prod = Tru
 
     # Generate the first-party package stores and linking of first-party packages
     for i, fp_link in enumerate(fp_links.values()):
-        fp_package = fp_link.get("package")
-        fp_version = fp_link.get("version", "0.0.0")
-        fp_path = fp_link.get("path")
-        fp_deps = fp_link.get("deps")
+        fp_package = fp_link["package"]
+        fp_version = fp_link["version"]
+        fp_path = fp_link["path"]
+        fp_deps = fp_link["deps"]
         fp_target = "//{}:{}".format(
             fp_path,
             rctx.attr.npm_package_target_name.replace("{dirname}", paths.basename(fp_path)),
@@ -690,8 +699,8 @@ def _generate_npm_package_locations(fp_links, npm_imports):
 
     # Add first-party packages
     for fp_link in fp_links.values():
-        fp_package = fp_link.get("package")
-        fp_link_packages = list(fp_link.get("link_packages").keys())
+        fp_package = fp_link["package"]
+        fp_link_packages = list(fp_link["link_packages"].keys())
         for location in fp_link_packages:
             if location not in location_to_packages:
                 location_to_packages[location] = []

npm/private/npm_translate_lock_helpers.bzl

@@ -260,7 +260,7 @@ def _get_npm_imports(importers, packages, replace_packages, patched_dependencies
     # make a lookup table of package to link name for each importer
     importer_links = {}
     for import_path, importer in importers.items():
-        dependencies = importer.get("all_deps")
+        dependencies = importer["all_deps"]
         if type(dependencies) != "dict":
             msg = "expected dict of dependencies in processed importer '{}'".format(import_path)
             fail(msg)
@@ -288,16 +288,16 @@ def _get_npm_imports(importers, packages, replace_packages, patched_dependencies
     patches_used = []
     result = {}
     for package_key, package_info in packages.items():
-        name = package_info.get("name")
-        version = package_info.get("version")
-        friendly_version = package_info.get("friendly_version")
-        deps = package_info.get("dependencies")
-        optional_deps = package_info.get("optional_dependencies")
-        dev_only = package_info.get("dev_only")
-        optional = package_info.get("optional")
-        requires_build = package_info.get("requires_build")
-        transitive_closure = package_info.get("transitive_closure")
-        resolution = package_info.get("resolution")
+        name = package_info["name"]
+        version = package_info["version"]
+        friendly_version = package_info["friendly_version"]
+        deps = package_info["dependencies"]
+        optional_deps = package_info["optional_dependencies"]
+        dev_only = package_info["dev_only"]
+        optional = package_info["optional"]
+        requires_build = package_info["requires_build"]
+        transitive_closure = package_info["transitive_closure"]
+        resolution = package_info["resolution"]
 
         resolution_type = resolution.get("type", None)
         if resolution_type == "directory":

npm/private/pnpm.bzl

@@ -207,7 +207,7 @@ def _convert_v5_packages(packages):
             has_bin = package_snapshot.get("hasBin", False),
             optional = package_snapshot.get("optional", False),
             requires_build = package_snapshot.get("requiresBuild", False),
-            resolution = package_snapshot.get("resolution"),
+            resolution = package_snapshot["resolution"],
         )
 
         if package_key in result:
@@ -257,8 +257,8 @@ def _strip_v6_default_registry_to_version(name, version):
 def _convert_pnpm_v6_importer_dependency_map(import_path, deps):
     result = {}
     for name, attributes in deps.items():
-        specifier = attributes.get("specifier")
-        version = attributes.get("version")
+        specifier = attributes["specifier"]
+        version = attributes["version"]
 
         if specifier.startswith("npm:") and not specifier.startswith("npm:{}@".format(name)):
             # Keep the npm: specifier for aliased dependencies
@@ -379,7 +379,7 @@ def _convert_v6_packages(packages):
             has_bin = package_snapshot.get("hasBin", False),
             optional = package_snapshot.get("optional", False),
             requires_build = package_snapshot.get("requiresBuild", False),
-            resolution = package_snapshot.get("resolution"),
+            resolution = package_snapshot["resolution"],
         )
 
         if package_key in result:
@@ -412,8 +412,8 @@ def _convert_pnpm_v9_package_dependency_map(snapshots, deps):
 def _convert_pnpm_v9_importer_dependency_map(import_path, deps):
     result = {}
     for name, attributes in deps.items():
-        specifier = attributes.get("specifier")
-        version = attributes.get("version")
+        specifier = attributes["specifier"]
+        version = attributes["version"]
 
         # Transition version[(patch)(peer)(data)] to a rules_js version format
         version = _convert_pnpm_v6_v9_version_peer_dep(version)
@@ -512,7 +512,7 @@ def _convert_v9_packages(packages, snapshots):
             has_bin = package_data.get("hasBin", False),
             optional = package_snapshot.get("optional", False),
             requires_build = None,  # Unknown from lockfile in v9
-            resolution = package_data.get("resolution"),
+            resolution = package_data["resolution"],
         )
 
         if package_key in result:

npm/private/transitive_closure.bzl

@@ -96,9 +96,9 @@ def translate_to_transitive_closure(importers, packages, prod = False, dev = Fal
     importers_deps = {}
     for importPath in importers.keys():
         lock_importer = importers[importPath]
-        prod_deps = {} if dev else lock_importer.get("dependencies")
-        dev_deps = {} if prod else lock_importer.get("dev_dependencies")
-        opt_deps = {} if no_optional else lock_importer.get("optional_dependencies")
+        prod_deps = {} if dev else lock_importer["dependencies"]
+        dev_deps = {} if prod else lock_importer["dev_dependencies"]
+        opt_deps = {} if no_optional else lock_importer["optional_dependencies"]
 
         deps = prod_deps | opt_deps
         all_deps = prod_deps | dev_deps | opt_deps