refactor: removing trailing whitespace in generated code (#2613)
The generated files still have some buildifier errors but this reduces
it a bit, and removes one unused import in the generated code.
### Changes are visible to end-users: no
### Test plan
- Covered by existing test cases
diff --git a/e2e/npm_translate_lock_disable_hooks/snapshots/defs.bzl b/e2e/npm_translate_lock_disable_hooks/snapshots/defs.bzl
index 0445b8a..b2e37e7 100644
--- a/e2e/npm_translate_lock_disable_hooks/snapshots/defs.bzl
+++ b/e2e/npm_translate_lock_disable_hooks/snapshots/defs.bzl
@@ -20,7 +20,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
@@ -34,7 +33,6 @@
scope_targets = {
"@aspect-test": [":{}/@aspect-test/c".format(name)],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -47,7 +45,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
diff --git a/e2e/npm_translate_lock_empty/snapshots/bzlmod/npm_defs.bzl b/e2e/npm_translate_lock_empty/snapshots/bzlmod/npm_defs.bzl
index 2f123d7..48866a4 100644
--- a/e2e/npm_translate_lock_empty/snapshots/bzlmod/npm_defs.bzl
+++ b/e2e/npm_translate_lock_empty/snapshots/bzlmod/npm_defs.bzl
@@ -21,7 +21,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -29,7 +28,6 @@
link_targets = None
scope_targets = None
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -42,7 +40,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
diff --git a/e2e/npm_translate_lock_empty/snapshots/wksp/npm_defs.bzl b/e2e/npm_translate_lock_empty/snapshots/wksp/npm_defs.bzl
index c6f9e99..ca82752 100644
--- a/e2e/npm_translate_lock_empty/snapshots/wksp/npm_defs.bzl
+++ b/e2e/npm_translate_lock_empty/snapshots/wksp/npm_defs.bzl
@@ -21,7 +21,6 @@
msg = "The npm_link_all_packages() macro loaded from @npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -29,7 +28,6 @@
link_targets = None
scope_targets = None
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -42,7 +40,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
diff --git a/e2e/npm_translate_lock_replace_packages/snapshots/bzlmod/npm_defs.bzl b/e2e/npm_translate_lock_replace_packages/snapshots/bzlmod/npm_defs.bzl
index 22681e0..b0b9871 100644
--- a/e2e/npm_translate_lock_replace_packages/snapshots/bzlmod/npm_defs.bzl
+++ b/e2e/npm_translate_lock_replace_packages/snapshots/bzlmod/npm_defs.bzl
@@ -21,7 +21,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -37,7 +36,6 @@
":{}/chalk".format(name),
":{}/lodash".format(name),
]
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -50,7 +48,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
diff --git a/e2e/npm_translate_lock_replace_packages/snapshots/wksp/npm_defs.bzl b/e2e/npm_translate_lock_replace_packages/snapshots/wksp/npm_defs.bzl
index 5e009fc..982974f 100644
--- a/e2e/npm_translate_lock_replace_packages/snapshots/wksp/npm_defs.bzl
+++ b/e2e/npm_translate_lock_replace_packages/snapshots/wksp/npm_defs.bzl
@@ -21,7 +21,6 @@
msg = "The npm_link_all_packages() macro loaded from @npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -37,7 +36,6 @@
":{}/chalk".format(name),
":{}/lodash".format(name),
]
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -50,7 +48,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl
index 56de9ad..ae154b5 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl
@@ -109,7 +109,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["<LOCKVERSION>", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"]
@@ -126,7 +126,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~lock-<LOCKVERSION>//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '<LOCKVERSION>', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -584,7 +583,6 @@
":{}/@scoped/b".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -597,7 +595,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -732,7 +729,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "@scoped/c" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl
index e3fe25a..a43a835 100644
--- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl
+++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl
@@ -108,7 +108,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["<LOCKVERSION>", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"]
@@ -125,7 +125,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~lock-<LOCKVERSION>//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '<LOCKVERSION>', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -578,7 +577,6 @@
scope_targets = {
"@scoped": [":{}/@scoped/a".format(name)],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -591,7 +589,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -719,7 +716,6 @@
link_targets.extend([":{}/@scoped/a".format(name)])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "a-types" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl
index 6b0686a..7c6122d 100644
--- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl
+++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl
@@ -109,7 +109,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["<LOCKVERSION>", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"]
@@ -126,7 +126,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~lock-<LOCKVERSION>//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '<LOCKVERSION>', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -596,7 +595,6 @@
":{}/@scoped/b".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -609,7 +607,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -744,7 +741,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "a-types" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl
index 6b0686a..7c6122d 100644
--- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl
+++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl
@@ -109,7 +109,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["<LOCKVERSION>", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"]
@@ -126,7 +126,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~lock-<LOCKVERSION>//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '<LOCKVERSION>', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -596,7 +595,6 @@
":{}/@scoped/b".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -609,7 +607,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -744,7 +741,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "a-types" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl
index 3d7f8ee..9d8b0e0 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl
@@ -109,7 +109,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["<LOCKVERSION>", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"]
@@ -126,7 +126,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~lock-<LOCKVERSION>//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '<LOCKVERSION>', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -584,7 +583,6 @@
":{}/@scoped/b".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -597,7 +595,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -732,7 +729,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "@scoped/c" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_workspace/snapshots/defs.bzl b/e2e/pnpm_workspace/snapshots/defs.bzl
index 4d53d6b..2db01e3 100644
--- a/e2e/pnpm_workspace/snapshots/defs.bzl
+++ b/e2e/pnpm_workspace/snapshots/defs.bzl
@@ -21,7 +21,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["", "app/a", "app/b", "app/c", "app/d", "lib/a", "lib/b", "lib/c", "lib/d"]
@@ -38,7 +38,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -268,7 +267,6 @@
":{}/@lib/b_alias".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -281,7 +279,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -369,7 +366,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "vendored-a" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl b/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl
index 31fbb7d..bdada40 100644
--- a/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl
+++ b/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl
@@ -21,7 +21,7 @@
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
_IMPORTER_PACKAGES = ["root", "", "app/a", "app/b", "app/c", "app/d", "lib/a", "lib/b", "lib/c", "lib/d"]
@@ -38,7 +38,6 @@
msg = "The npm_link_all_packages() macro loaded from @aspect_rules_js~~npm~npm//:defs.bzl and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: 'root', pnpm workspace projects: %s" % (bazel_package, "'" + "', '".join(_IMPORTER_PACKAGES) + "'")
fail(msg)
-
if is_root:
store_0(name)
store_1(name)
@@ -268,7 +267,6 @@
":{}/@lib/b_alias".format(name),
],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -281,7 +279,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -369,7 +366,6 @@
])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "vendored-a" package
# buildifier: disable=function-docstring
def _fp_link_0(name):
diff --git a/npm/private/npm_translate_lock_generate.bzl b/npm/private/npm_translate_lock_generate.bzl
index 55912f8..85ecf95 100644
--- a/npm/private/npm_translate_lock_generate.bzl
+++ b/npm/private/npm_translate_lock_generate.bzl
@@ -39,7 +39,7 @@
)"""
_FP_DIRECT_TMPL = \
- """
+ """\
# Generated npm_link_package_store for linking of first-party "{pkg}" package
# buildifier: disable=function-docstring
def _fp_link_{i}(name):
@@ -228,8 +228,7 @@
if not is_root and not link:
msg = "The npm_link_all_packages() macro loaded from {defs_bzl_file} and called in bazel package '%s' may only be called in bazel packages that correspond to the pnpm root package or pnpm workspace projects. Projects are discovered from the pnpm-lock.yaml and may be missing if the lockfile is out of date. Root package: '{root_package}', pnpm workspace projects: %s" % (bazel_package, {link_packages_comma_separated})
fail(msg)
-{validation_call}
-""".format(
+{validation_call}""".format(
defs_bzl_file = "@{}//:{}".format(rctx.name, rctx.attr.defs_bzl_filename),
link_packages_comma_separated = "\"'\" + \"', '\".join(_IMPORTER_PACKAGES) + \"'\"" if package_to_importer else "\"\"",
root_package = root_package,
@@ -448,7 +447,7 @@
first_link = False
# Invoke and collect link targets from the `imported_links` param
- npm_link_all_packages_bzl.append("""
+ npm_link_all_packages_bzl.append("""\
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -459,8 +458,7 @@
scope_targets = {}
if _scope not in scope_targets:
scope_targets[_scope] = []
- scope_targets[_scope].extend(_targets)
-""")
+ scope_targets[_scope].extend(_targets)""")
# Generate catch all & scoped js_library targets
# TODO(3.0): don't generate empty js_library targets?
@@ -487,19 +485,18 @@
defs_bzl_header.append("# buildifier: disable=bzl-visibility")
defs_bzl_header.append("""load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library")""")
- # Only add visibility load if package visibility is configured
- if has_package_visibility:
- defs_bzl_header.append("")
- defs_bzl_header.append("# buildifier: disable=bzl-visibility")
- defs_bzl_header.append("""load("@aspect_rules_js//npm/private:npm_package_visibility.bzl", _npm_validate_package_visibility = "validate_npm_package_visibility")""")
-
if fp_links:
defs_bzl_header.append("")
defs_bzl_header.append("# buildifier: disable=bzl-visibility")
defs_bzl_header.append("""load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")""")
defs_bzl_header.append("")
defs_bzl_header.append("# buildifier: disable=bzl-visibility")
- defs_bzl_header.append("""load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")""")
+ defs_bzl_header.append("""load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")""")
+
+ if has_package_visibility:
+ defs_bzl_header.append("")
+ defs_bzl_header.append("# buildifier: disable=bzl-visibility")
+ defs_bzl_header.append("""load("@aspect_rules_js//npm/private:npm_package_visibility.bzl", _npm_validate_package_visibility = "validate_npm_package_visibility")""")
# Build the defs.bzl file contents
defs_bzl_contents = [
@@ -518,7 +515,7 @@
"",
"\n".join(npm_link_targets_bzl),
"",
- "\n".join(link_factories_bzl),
+ "\n\n".join(link_factories_bzl),
])
rctx_files[rctx.attr.defs_bzl_filename] = defs_bzl_contents
diff --git a/npm/private/test/snapshots/npm_defs.bzl b/npm/private/test/snapshots/npm_defs.bzl
index d81a463..fb17181 100644
--- a/npm/private/test/snapshots/npm_defs.bzl
+++ b/npm/private/test/snapshots/npm_defs.bzl
@@ -1093,13 +1093,13 @@
load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_visibility.bzl", _npm_validate_package_visibility = "validate_npm_package_visibility")
-
-# buildifier: disable=bzl-visibility
load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_local_link_package_store = "npm_local_link_package_store_internal")
# buildifier: disable=bzl-visibility
-load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal")
+load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_local_package_store = "npm_local_package_store_internal")
+
+# buildifier: disable=bzl-visibility
+load("@aspect_rules_js//npm/private:npm_package_visibility.bzl", _npm_validate_package_visibility = "validate_npm_package_visibility")
_IMPORTER_PACKAGES = ["", "examples/js_binary", "examples/js_lib_pkg/a", "examples/js_lib_pkg/b", "examples/linked_consumer", "examples/linked_empty_node_modules", "examples/linked_lib", "examples/linked_pkg", "examples/macro", "examples/nextjs", "examples/npm_deps", "examples/npm_package/libs/lib_a", "examples/npm_package/packages/pkg_a", "examples/npm_package/packages/pkg_b", "examples/npm_package/packages/pkg_d", "examples/npm_package/packages/pkg_e", "examples/runfiles", "examples/stack_traces", "examples/webpack_cli", "js/private/coverage/bundle", "js/private/devserver/src", "js/private/test/image", "js/private/test/js_run_devserver", "js/private/test/node-patches", "js/private/worker/src", "npm/private/test", "npm/private/test/npm_package", "npm/private/test/npm_package_publish"]
@@ -1155,7 +1155,6 @@
# Validate package visibility before creating any targets
_npm_validate_package_visibility(bazel_package, _NPM_PACKAGE_LOCATIONS, _NPM_PACKAGE_VISIBILITY)
-
if is_root:
store_0(name)
store_1(name)
@@ -2788,7 +2787,6 @@
scope_targets = {
"@mycorp": [":{}/@mycorp/pkg-d".format(name)],
}
-
for link_fn in imported_links:
new_link_targets, new_scope_targets = link_fn(name, prod, dev)
if not link_targets:
@@ -2801,7 +2799,6 @@
scope_targets[_scope] = []
scope_targets[_scope].extend(_targets)
-
if scope_targets:
for scope, scoped_targets in scope_targets.items():
_js_library(
@@ -3053,7 +3050,6 @@
link_targets.extend([":{}/@mycorp/pkg-d".format(name)])
return link_targets
-
# Generated npm_link_package_store for linking of first-party "@mycorp/pkg-a" package
# buildifier: disable=function-docstring
def _fp_link_2(name):
