Commit 1f46b75a1e8 for nodejs
commit 1f46b75a1e8f67a2be382c1e8d379ca80ad9699d
Author: James M Snell <jasnell@gmail.com>
Date: Sun Nov 15 18:05:53 2026 +0000
url: share URLPattern exec() and test() argument parsing
URLPattern::Exec() and URLPattern::Test() duplicated the parsing of the
input and baseURL arguments. Move it into a shared
ParseURLPatternMatchArgs() helper.
Assisted-by: Claude
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/67495
Reviewed-By: Guilherme Araújo <arauujogui@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
diff --git a/src/node_url_pattern.cc b/src/node_url_pattern.cc
index 63f01d58170..eac1d62f34d 100644
--- a/src/node_url_pattern.cc
+++ b/src/node_url_pattern.cc
@@ -560,46 +560,72 @@ bool URLPattern::Test(Environment* env,
// V8 Methods
-void URLPattern::Exec(const FunctionCallbackInfo<Value>& args) {
- URLPattern* url_pattern;
- ASSIGN_OR_RETURN_UNWRAP(&url_pattern, args.This());
- auto env = Environment::GetCurrent(args);
+namespace {
+// The arguments of URLPattern.prototype.exec() and test(). When the input is
+// a string, `input` refers to `input_storage`, so instances must not be copied
+// or moved.
+struct URLPatternMatchArgs {
+ URLPatternMatchArgs() = default;
+ URLPatternMatchArgs(const URLPatternMatchArgs&) = delete;
+ URLPatternMatchArgs& operator=(const URLPatternMatchArgs&) = delete;
+
+ std::optional<std::string_view> base_url_view() const {
+ return base_url ? std::optional<std::string_view>(*base_url) : std::nullopt;
+ }
ada::url_pattern_input input;
- std::optional<std::string> baseURL{};
- std::string input_base;
+ std::string input_storage;
+ std::optional<std::string> base_url;
+};
+
+// Parses the `input` and `baseURL` arguments of exec() and test(). Returns
+// false if a JavaScript exception is pending.
+bool ParseURLPatternMatchArgs(Environment* env,
+ const FunctionCallbackInfo<Value>& args,
+ URLPatternMatchArgs* out) {
if (args.Length() == 0 || args[0]->IsNullOrUndefined()) {
- input = ada::url_pattern_init{};
+ out->input = ada::url_pattern_init{};
} else if (args[0]->IsString()) {
Utf8Value input_value(env->isolate(), args[0].As<String>());
- input_base = input_value.ToString();
- input = std::string_view(input_base);
+ out->input_storage = input_value.ToString();
+ out->input = std::string_view(out->input_storage);
} else if (args[0]->IsObject()) {
- auto maybeInput = URLPatternInit::FromJsObject(env, args[0].As<Object>());
- if (!maybeInput.has_value()) return;
- input = std::move(*maybeInput);
+ auto maybeInput =
+ URLPattern::URLPatternInit::FromJsObject(env, args[0].As<Object>());
+ if (!maybeInput.has_value()) return false;
+ out->input = std::move(*maybeInput);
} else {
THROW_ERR_INVALID_ARG_TYPE(
env, "URLPattern input needs to be a string or an object");
- return;
+ return false;
}
if (args.Length() > 1 && !args[1]->IsUndefined()) {
if (args[1]->IsNull()) {
- baseURL = std::string("null");
+ out->base_url = std::string("null");
} else if (args[1]->IsString()) {
Utf8Value base_url_value(env->isolate(), args[1].As<String>());
- baseURL = base_url_value.ToStringView();
+ out->base_url = base_url_value.ToStringView();
} else {
THROW_ERR_INVALID_ARG_TYPE(env, "baseURL must be a string");
- return;
+ return false;
}
}
+ return true;
+}
+} // namespace
+void URLPattern::Exec(const FunctionCallbackInfo<Value>& args) {
+ URLPattern* url_pattern;
+ ASSIGN_OR_RETURN_UNWRAP(&url_pattern, args.This());
+ auto env = Environment::GetCurrent(args);
+
+ URLPatternMatchArgs match_args;
+ if (!ParseURLPatternMatchArgs(env, args, &match_args)) return;
+
+ std::optional<std::string_view> base_url = match_args.base_url_view();
Local<Value> result;
- std::optional<std::string_view> baseURL_opt =
- baseURL ? std::optional<std::string_view>(*baseURL) : std::nullopt;
- if (!url_pattern->Exec(env, input, baseURL_opt).ToLocal(&result)) {
+ if (!url_pattern->Exec(env, match_args.input, base_url).ToLocal(&result)) {
THROW_ERR_OPERATION_FAILED(env, "Failed to exec URLPattern");
return;
}
@@ -611,40 +637,11 @@ void URLPattern::Test(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&url_pattern, args.This());
auto env = Environment::GetCurrent(args);
- ada::url_pattern_input input;
- std::optional<std::string> baseURL{};
- std::string input_base;
- if (args.Length() == 0 || args[0]->IsNullOrUndefined()) {
- input = ada::url_pattern_init{};
- } else if (args[0]->IsString()) {
- Utf8Value input_value(env->isolate(), args[0].As<String>());
- input_base = input_value.ToString();
- input = std::string_view(input_base);
- } else if (args[0]->IsObject()) {
- auto maybeInput = URLPatternInit::FromJsObject(env, args[0].As<Object>());
- if (!maybeInput.has_value()) return;
- input = std::move(*maybeInput);
- } else {
- THROW_ERR_INVALID_ARG_TYPE(
- env, "URLPattern input needs to be a string or an object");
- return;
- }
-
- if (args.Length() > 1 && !args[1]->IsUndefined()) {
- if (args[1]->IsNull()) {
- baseURL = std::string("null");
- } else if (args[1]->IsString()) {
- Utf8Value base_url_value(env->isolate(), args[1].As<String>());
- baseURL = base_url_value.ToStringView();
- } else {
- THROW_ERR_INVALID_ARG_TYPE(env, "baseURL must be a string");
- return;
- }
- }
+ URLPatternMatchArgs match_args;
+ if (!ParseURLPatternMatchArgs(env, args, &match_args)) return;
- std::optional<std::string_view> baseURL_opt =
- baseURL ? std::optional<std::string_view>(*baseURL) : std::nullopt;
- args.GetReturnValue().Set(url_pattern->Test(env, input, baseURL_opt));
+ std::optional<std::string_view> base_url = match_args.base_url_view();
+ args.GetReturnValue().Set(url_pattern->Test(env, match_args.input, base_url));
}
#define URL_PATTERN_COMPONENT_GETTERS(uppercase_name, lowercase_name) \