refactor: do not repeat name="node_modules" assertion per package .bzl (#2568)
Ref #2138
### Changes are visible to end-users: no
### Test plan
- Covered by existing test cases
diff --git a/e2e/gyp_no_install_script/snapshots/segfault-handler_defs.bzl b/e2e/gyp_no_install_script/snapshots/segfault-handler_defs.bzl
index faebd6b..0d2e0c5 100644
--- a/e2e/gyp_no_install_script/snapshots/segfault-handler_defs.bzl
+++ b/e2e/gyp_no_install_script/snapshots/segfault-handler_defs.bzl
@@ -69,9 +69,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl b/e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl
index 1bee9e3..e169cf0 100644
--- a/e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl
+++ b/e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl
@@ -53,9 +53,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl
index 3084470..c3b9e62 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl
@@ -62,9 +62,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl
index 4040a23..9fbb7c1 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl
@@ -62,9 +62,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl
index 7054948..c1f076d 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl
@@ -59,9 +59,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/esbuild_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/esbuild_links_defs.bzl
index 69fb85f..a9d707f 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/esbuild_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/esbuild_links_defs.bzl
@@ -189,9 +189,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/lodash-4.17.21_tgz_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/lodash-4.17.21_tgz_defs.bzl
index c6cf8cf..f7a74a0 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/lodash-4.17.21_tgz_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/lodash-4.17.21_tgz_defs.bzl
@@ -53,9 +53,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v101/snapshots/rollup_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/rollup_links_defs.bzl
index 0c9741c..5793ce9 100644
--- a/e2e/pnpm_lockfiles/v101/snapshots/rollup_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v101/snapshots/rollup_links_defs.bzl
@@ -63,9 +63,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl
index 3084470..c3b9e62 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl
@@ -62,9 +62,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl
index 4040a23..9fbb7c1 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl
@@ -62,9 +62,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl
index 7054948..c1f076d 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl
@@ -59,9 +59,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/esbuild_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/esbuild_links_defs.bzl
index 69fb85f..a9d707f 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/esbuild_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/esbuild_links_defs.bzl
@@ -189,9 +189,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/lodash-4.17.21_tgz_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/lodash-4.17.21_tgz_defs.bzl
index c6cf8cf..f7a74a0 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/lodash-4.17.21_tgz_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/lodash-4.17.21_tgz_defs.bzl
@@ -53,9 +53,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/rollup_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/rollup_links_defs.bzl
index 0c9741c..5793ce9 100644
--- a/e2e/pnpm_lockfiles/v90/snapshots/rollup_links_defs.bzl
+++ b/e2e/pnpm_lockfiles/v90/snapshots/rollup_links_defs.bzl
@@ -63,9 +63,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/npm_import.bzl b/npm/private/npm_import.bzl
index d99d4ab..b7caf9b 100644
--- a/npm/private/npm_import.bzl
+++ b/npm/private/npm_import.bzl
@@ -266,6 +266,7 @@
# Invoked by generated npm_link_imported_package_store targets for npm package {package}@{version}
# buildifier: disable=function-docstring
def npm_link_imported_package_internal(
+ name,
package,
version,
dev,
@@ -278,6 +279,8 @@
is_root = bazel_package == root_package
+ if name != "node_modules":
+ fail("npm_link_imported_package: customizing 'name' is not supported")
if not is_root and not link:
msg = "Nothing to link in bazel package '{bazel_package}' for npm package npm package {package}@{version}. This is neither the root package nor a link package of this package.".format(
bazel_package = bazel_package,
@@ -316,9 +319,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/circular_links_defs.bzl b/npm/private/test/snapshots/circular_links_defs.bzl
index cb3b074..30658f4 100644
--- a/npm/private/test/snapshots/circular_links_defs.bzl
+++ b/npm/private/test/snapshots/circular_links_defs.bzl
@@ -68,9 +68,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/closure-compiler_links_defs.bzl b/npm/private/test/snapshots/closure-compiler_links_defs.bzl
index 6fb389c..a649013 100644
--- a/npm/private/test/snapshots/closure-compiler_links_defs.bzl
+++ b/npm/private/test/snapshots/closure-compiler_links_defs.bzl
@@ -105,9 +105,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/fsevents_links_defs.bzl b/npm/private/test/snapshots/fsevents_links_defs.bzl
index 1ea97bc..9d63706 100644
--- a/npm/private/test/snapshots/fsevents_links_defs.bzl
+++ b/npm/private/test/snapshots/fsevents_links_defs.bzl
@@ -59,9 +59,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/next_links_defs.bzl b/npm/private/test/snapshots/next_links_defs.bzl
index a0aafa7..05ede59 100644
--- a/npm/private/test/snapshots/next_links_defs.bzl
+++ b/npm/private/test/snapshots/next_links_defs.bzl
@@ -200,9 +200,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/rollup_links_defs.bzl b/npm/private/test/snapshots/rollup_links_defs.bzl
index 4444c0f..e7b04dd 100644
--- a/npm/private/test/snapshots/rollup_links_defs.bzl
+++ b/npm/private/test/snapshots/rollup_links_defs.bzl
@@ -63,9 +63,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
diff --git a/npm/private/test/snapshots/unused_links_defs.bzl b/npm/private/test/snapshots/unused_links_defs.bzl
index 2506bef..3a4de61 100644
--- a/npm/private/test/snapshots/unused_links_defs.bzl
+++ b/npm/private/test/snapshots/unused_links_defs.bzl
@@ -59,9 +59,8 @@
name = "node_modules",
dev = False,
link = True):
- if name != "node_modules":
- fail("npm_link_imported_package: customizing 'name' is not supported")
return _npm_link_imported_package_internal(
+ name,
package = PACKAGE,
version = VERSION,
dev = dev,
