Add patch_tool argument to npm_translate_lock

npm/extensions.bzl

@@ -156,6 +156,7 @@ WARNING: Cannot determine home directory in order to load home `.npmrc` file in
             npm_auth_username = i.npm_auth_username,
             package = i.package,
             package_visibility = i.package_visibility,
+            patch_tool = i.patch_tool,
             patch_args = i.patch_args,
             patches = i.patches,
             replace_package = i.replace_package,
@@ -188,6 +189,7 @@ def _npm_import_bzlmod(i):
         npm_auth_password = i.npm_auth_password,
         package = i.package,
         package_visibility = i.package_visibility,
+        patch_tool = i.patch_tool,
         patch_args = i.patch_args,
         patches = i.patches,
         replace_package = i.replace_package,

npm/private/npm_import.bzl

@@ -503,7 +503,12 @@ def _npm_import_rule_impl(rctx):
 
     # apply patches to the extracted package before reading the package.json incase
     # the patch targets the package.json itself
-    patch(rctx, patch_args = rctx.attr.patch_args, patch_directory = _EXTRACT_TO_DIRNAME)
+    patch(
+        rctx,
+        patch_tool = rctx.path(rctx.attr.patch_tool) if rctx.attr.patch_tool else "patch",
+        patch_args = rctx.attr.patch_args,
+        patch_directory = _EXTRACT_TO_DIRNAME,
+    )
 
     pkg_json = json.decode(rctx.read(_EXTRACT_TO_PACKAGE_JSON))
 
@@ -822,6 +827,7 @@ _ATTRS = dicts.add(_COMMON_ATTRS, {
     "npm_auth_basic": attr.string(),
     "npm_auth_password": attr.string(),
     "npm_auth_username": attr.string(),
+    "patch_tool": attr.label(),
     "patch_args": attr.string_list(),
     "patches": attr.label_list(),
     "url": attr.string(),
@@ -886,6 +892,7 @@ def npm_import(
         commit = "",
         replace_package = None,
         package_visibility = ["//visibility:public"],
+        patch_tool = None,
         patch_args = ["-p0"],
         patches = [],
         custom_postinstall = "",
@@ -1095,6 +1102,8 @@ def npm_import(
 
         package_visibility: Visibility of generated node_module link targets.
 
+        patch_tool: The patch tool.
+
         patch_args: Arguments to pass to the patch tool.
 
             `-p1` will usually be needed for patches generated by git.
@@ -1161,6 +1170,7 @@ def npm_import(
         integrity = integrity,
         url = url,
         commit = commit,
+        patch_tool = patch_tool,
         patch_args = patch_args,
         patches = patches,
         custom_postinstall = custom_postinstall,

npm/private/npm_translate_lock.bzl

@@ -65,6 +65,7 @@ _ATTRS = {
     "npm_package_target_name": attr.string(),
     "npmrc": attr.label(),
     "package_visibility": attr.string_list_dict(),
+    "patch_tool": attr.label(),
     "patch_args": attr.string_list_dict(),
     "patches": attr.string_list_dict(),
     "use_pnpm": attr.label(default = "@pnpm//:package/bin/pnpm.cjs"),  # bzlmod pnpm extension
@@ -161,6 +162,7 @@ def npm_translate_lock(
         use_home_npmrc = None,
         data = [],
         patches = {},
+        patch_tool = None,
         patch_args = {"*": ["-p0"]},
         custom_postinstalls = {},
         package_visibility = {},
@@ -277,6 +279,8 @@ def npm_translate_lock(
 
             Read more: [patching](/docs/pnpm.md#patching)
 
+        patch_tool: The patch tool.
+
         patch_args: A map of package names or package names with their version (e.g., "my-package" or "my-package@v1.2.3")
             to a label list arguments to pass to the patch tool. The most specific match wins.
 
@@ -569,6 +573,7 @@ def npm_translate_lock(
         npmrc = npmrc,
         use_home_npmrc = use_home_npmrc,
         patches = patches,
+        patch_tool = patch_tool,
         patch_args = patch_args,
         custom_postinstalls = custom_postinstalls,
         package_visibility = package_visibility,

npm/private/npm_translate_lock_generate.bzl

@@ -18,7 +18,7 @@ _NPM_IMPORT_TMPL = \
         version = "{version}",
         url = "{url}",
         system_tar = "{system_tar}",
-        package_visibility = {package_visibility},{maybe_dev}{maybe_commit}{maybe_generate_bzl_library_targets}{maybe_integrity}{maybe_deps}{maybe_transitive_closure}{maybe_patches}{maybe_patch_args}{maybe_lifecycle_hooks}{maybe_custom_postinstall}{maybe_lifecycle_hooks_env}{maybe_lifecycle_hooks_execution_requirements}{maybe_bins}{maybe_npm_auth}{maybe_npm_auth_basic}{maybe_npm_auth_username}{maybe_npm_auth_password}{maybe_replace_package}{maybe_lifecycle_hooks_use_default_shell_env}
+        package_visibility = {package_visibility},{maybe_dev}{maybe_commit}{maybe_generate_bzl_library_targets}{maybe_integrity}{maybe_deps}{maybe_transitive_closure}{maybe_patches}{maybe_patch_tool}{maybe_patch_args}{maybe_lifecycle_hooks}{maybe_custom_postinstall}{maybe_lifecycle_hooks_env}{maybe_lifecycle_hooks_execution_requirements}{maybe_bins}{maybe_npm_auth}{maybe_npm_auth_basic}{maybe_npm_auth_username}{maybe_npm_auth_password}{maybe_replace_package}{maybe_lifecycle_hooks_use_default_shell_env}
     )
 """
 
@@ -511,6 +511,8 @@ def _gen_npm_import(rctx, system_tar, _import, link_workspace):
         deps = %s,""" % starlark_codegen_utils.to_dict_attr(_import.deps, 2)) if len(_import.deps) > 0 else ""
     maybe_transitive_closure = ("""
         transitive_closure = %s,""" % starlark_codegen_utils.to_dict_list_attr(_import.transitive_closure, 2)) if len(_import.transitive_closure) > 0 else ""
+    maybe_patch_tool = ("""
+        patch_tool = "%s",""" % _import.patch_tool) if _import.patch_tool else ""
     maybe_patches = ("""
         patches = %s,""" % _import.patches) if len(_import.patches) > 0 else ""
     maybe_patch_args = ("""
@@ -562,6 +564,7 @@ def _gen_npm_import(rctx, system_tar, _import, link_workspace):
         maybe_npm_auth_basic = maybe_npm_auth_basic,
         maybe_npm_auth_password = maybe_npm_auth_password,
         maybe_npm_auth_username = maybe_npm_auth_username,
+        maybe_patch_tool = maybe_patch_tool,
         maybe_patch_args = maybe_patch_args,
         maybe_patches = maybe_patches,
         maybe_replace_package = maybe_replace_package,

npm/private/npm_translate_lock_helpers.bzl

@@ -449,6 +449,7 @@ ERROR: can not apply both `pnpm.patchedDependencies` and `npm_translate_lock(pat
             name = repo_name,
             package = name,
             package_visibility = package_visibility,
+            patch_tool = attr.patch_tool,
             patch_args = patch_args,
             patches = patches,
             root_package = root_package,