refactor: rename JsInfo npm_package_store_deps to npm_package_store_i…

…nfos (#1620)

BUILD.bazel

@@ -65,7 +65,7 @@ diff_test(
 )
 
 # Example of manually linking a first-party dependency. Its transitive npm dependencies
-# are picked up automatically via 'npm_package_store_deps' in the js_library targets that
+# are picked up automatically via 'npm_package_store_infos' in the js_library targets that
 # the `npm_package` target depends on.
 npm_link_package(
     name = "node_modules/@mycorp/pkg-b",

js/libs.bzl

@@ -16,7 +16,7 @@ load(
     _envs_for_log_level = "envs_for_log_level",
     _gather_files_from_js_info = "gather_files_from_js_info",
     _gather_npm_linked_packages = "gather_npm_linked_packages",
-    _gather_npm_package_store_deps = "gather_npm_package_store_deps",
+    _gather_npm_package_store_infos = "gather_npm_package_store_infos",
     _gather_runfiles = "gather_runfiles",
     _gather_transitive_declarations = "gather_transitive_declarations",
     _gather_transitive_sources = "gather_transitive_sources",
@@ -29,7 +29,7 @@ js_lib_helpers = struct(
     envs_for_log_level = _envs_for_log_level,
     gather_files_from_js_info = _gather_files_from_js_info,
     gather_npm_linked_packages = _gather_npm_linked_packages,
-    gather_npm_package_store_deps = _gather_npm_package_store_deps,
+    gather_npm_package_store_infos = _gather_npm_package_store_infos,
     gather_runfiles = _gather_runfiles,
     gather_transitive_declarations = _gather_transitive_declarations,
     gather_transitive_sources = _gather_transitive_sources,

js/private/js_helpers.bzl

@@ -7,12 +7,12 @@ load(":js_info.bzl", "JsInfo")
 
 DOWNSTREAM_LINKED_NPM_DEPS_DOCSTRING = """If this list contains linked npm packages, npm package store targets or other targets that provide
 `JsInfo`, `NpmPackageStoreInfo` providers are gathered from `JsInfo`. This is done directly from
-the `npm_package_store_deps` field of these. For linked npm package targets, the underlying
+the `npm_package_store_infos` field of these. For linked npm package targets, the underlying
 `npm_package_store` target(s) that back the links is used. Gathered `NpmPackageStoreInfo`
 providers are propagated to the direct dependencies of downstream linked `npm_package` targets.
 
 NB: Linked npm package targets that are "dev" dependencies do not forward their underlying
-`npm_package_store` target(s) through `npm_package_store_deps` and will therefore not be
+`npm_package_store` target(s) through `npm_package_store_infos` and will therefore not be
 propagated to the direct dependencies of downstream linked `npm_package` targets. npm packages
 that come in from `npm_translate_lock` are considered "dev" dependencies if they are have
 `dev: true` set in the pnpm lock file. This should be all packages that are only listed as
@@ -90,7 +90,7 @@ def gather_npm_linked_packages(srcs, deps):
         if JsInfo in target and hasattr(target[JsInfo], "npm_linked_packages")
     ])
 
-def gather_npm_package_store_deps(targets):
+def gather_npm_package_store_infos(targets):
     """Gathers NpmPackageStoreInfo providers from the list of targets
 
     Args:
@@ -100,14 +100,14 @@ def gather_npm_package_store_deps(targets):
         A depset of npm package stores gathered
     """
 
-    # npm_package_store_deps
-    npm_package_store_deps = [
-        target[JsInfo].npm_package_store_deps
+    # npm_package_store_infos
+    npm_package_store_infos = [
+        target[JsInfo].npm_package_store_infos
         for target in targets
         if JsInfo in target
     ]
 
-    return depset([], transitive = npm_package_store_deps)
+    return depset([], transitive = npm_package_store_infos)
 
 def copy_js_file_to_bin_action(ctx, file):
     if ctx.label.workspace_name != file.owner.workspace_name or ctx.label.package != file.owner.package:

js/private/js_info.bzl

@@ -5,7 +5,7 @@ JsInfo = provider(
     fields = {
         "declarations": "A depset of declaration files produced by the target",
         "npm_linked_packages": "A depset of files in npm linked package dependencies of the target and the target's transitive deps",
-        "npm_package_store_deps": "A depset of NpmPackageStoreInfo providers from non-dev npm dependencies of the target and the target's transitive dependencies to use as direct dependencies when linking downstream npm_package targets with npm_link_package",
+        "npm_package_store_infos": "A depset of NpmPackageStoreInfo providers from non-dev npm dependencies of the target and the target's transitive dependencies to use as direct dependencies when linking downstream npm_package targets with npm_link_package",
         "sources": "A depset of source files produced by the target",
         "transitive_declarations": "A depset of declaration files produced by the target and the target's transitive deps",
         "transitive_sources": "A depset of source files produced by the target and the target's transitive deps",
@@ -15,7 +15,7 @@ JsInfo = provider(
 def js_info(
         declarations = depset(),
         npm_linked_packages = depset(),
-        npm_package_store_deps = depset(),
+        npm_package_store_infos = depset(),
         sources = depset(),
         transitive_declarations = depset(),
         transitive_sources = depset()):
@@ -24,7 +24,7 @@ def js_info(
     Args:
         declarations: See JsInfo documentation
         npm_linked_packages: See JsInfo documentation
-        npm_package_store_deps: See JsInfo documentation
+        npm_package_store_infos: See JsInfo documentation
         sources: See JsInfo documentation
         transitive_declarations: See JsInfo documentation
         transitive_sources: See JsInfo documentation
@@ -36,8 +36,8 @@ def js_info(
         fail("Expected declarations to be a depset")
     if type(npm_linked_packages) != "depset":
         fail("Expected npm_linked_packages to be a depset")
-    if type(npm_package_store_deps) != "depset":
-        fail("Expected npm_package_store_deps to be a depset")
+    if type(npm_package_store_infos) != "depset":
+        fail("Expected npm_package_store_infos to be a depset")
     if type(sources) != "depset":
         fail("Expected sources to be a depset")
     if type(transitive_declarations) != "depset":
@@ -48,7 +48,7 @@ def js_info(
     return JsInfo(
         declarations = declarations,
         npm_linked_packages = npm_linked_packages,
-        npm_package_store_deps = npm_package_store_deps,
+        npm_package_store_infos = npm_package_store_infos,
         sources = sources,
         transitive_declarations = transitive_declarations,
         transitive_sources = transitive_sources,

js/private/js_library.bzl

@@ -24,7 +24,7 @@ js_library(
 """
 
 load(":js_info.bzl", "JsInfo", "js_info")
-load(":js_helpers.bzl", "DOWNSTREAM_LINKED_NPM_DEPS_DOCSTRING", "JS_LIBRARY_DATA_ATTR", "copy_js_file_to_bin_action", "gather_npm_linked_packages", "gather_npm_package_store_deps", "gather_runfiles", "gather_transitive_declarations", "gather_transitive_sources")
+load(":js_helpers.bzl", "DOWNSTREAM_LINKED_NPM_DEPS_DOCSTRING", "JS_LIBRARY_DATA_ATTR", "copy_js_file_to_bin_action", "gather_npm_linked_packages", "gather_npm_package_store_infos", "gather_runfiles", "gather_transitive_declarations", "gather_transitive_sources")
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "COPY_FILE_TO_BIN_TOOLCHAINS")
 
 _DOC = """A library of JavaScript sources. Provides JsInfo, the primary provider used in rules_js
@@ -195,7 +195,7 @@ def _js_library_impl(ctx):
         deps = ctx.attr.deps,
     )
 
-    npm_package_store_deps = gather_npm_package_store_deps(
+    npm_package_store_infos = gather_npm_package_store_infos(
         targets = ctx.attr.srcs + ctx.attr.data + ctx.attr.deps,
     )
 
@@ -216,7 +216,7 @@ def _js_library_impl(ctx):
         js_info(
             declarations = declarations,
             npm_linked_packages = npm_linked_packages,
-            npm_package_store_deps = npm_package_store_deps,
+            npm_package_store_infos = npm_package_store_infos,
             sources = sources,
             transitive_declarations = transitive_declarations,
             transitive_sources = transitive_sources,