fixup! src: define urlpattern components using a macro

Author: JonasBa

src/node_url_pattern.cc

@@ -585,77 +585,17 @@ void URLPattern::Test(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(url_pattern->Test(env, input, baseURL_opt));
 }
 
-void URLPattern::Protocol(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Protocol().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Username(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Username().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Password(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Password().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Hostname(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Hostname().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Port(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Port().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Pathname(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Pathname().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Search(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Search().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
-  }
-}
-
-void URLPattern::Hash(const FunctionCallbackInfo<Value>& info) {
-  URLPattern* url_pattern;
-  ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());
-  Local<Value> result;
-  if (url_pattern->Hash().ToLocal(&result)) {
-    info.GetReturnValue().Set(result);
+#define URL_PATTERN_COMPONENT_GETTERS(uppercase_name, lowercase_name)          \
+  void URLPattern::uppercase_name(const FunctionCallbackInfo<Value>& info) {   \
+    URLPattern* url_pattern;                                                   \
+    ASSIGN_OR_RETURN_UNWRAP(&url_pattern, info.This());                        \
+    Local<Value> result;                                                       \
+    if (url_pattern->uppercase_name().ToLocal(&result)) {                      \
+      info.GetReturnValue().Set(result);                                       \
+    }                                                                          \
   }
-}
+URL_PATTERN_COMPONENTS(URL_PATTERN_COMPONENT_GETTERS)
+#undef URL_PATTERN_COMPONENT_GETTERS
 
 void URLPattern::HasRegexpGroups(const FunctionCallbackInfo<Value>& info) {
   URLPattern* url_pattern;
@@ -665,14 +605,10 @@ void URLPattern::HasRegexpGroups(const FunctionCallbackInfo<Value>& info) {
 
 static void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
   registry->Register(URLPattern::New);
-  registry->Register(URLPattern::Protocol);
-  registry->Register(URLPattern::Username);
-  registry->Register(URLPattern::Password);
-  registry->Register(URLPattern::Hostname);
-  registry->Register(URLPattern::Port);
-  registry->Register(URLPattern::Pathname);
-  registry->Register(URLPattern::Search);
-  registry->Register(URLPattern::Hash);
+#define URL_PATTERN_COMPONENT_GETTERS(uppercase_name, _)                       \
+  registry->Register(URLPattern::uppercase_name);
+  URL_PATTERN_COMPONENTS(URL_PATTERN_COMPONENT_GETTERS)
+#undef URL_PATTERN_COMPONENT_GETTERS
   registry->Register(URLPattern::HasRegexpGroups);
   registry->Register(URLPattern::Exec);
   registry->Register(URLPattern::Test);
@@ -695,61 +631,18 @@ static void Initialize(Local<Object> target,
   auto signature = Signature::New(isolate, ctor_tmpl);
 
   instance_template->SetInternalFieldCount(URLPattern::kInternalFieldCount);
-  prototype_template->SetAccessorProperty(
-      env->protocol_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Protocol, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->username_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Username, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->password_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Password, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->hostname_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Hostname, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
 
-  prototype_template->SetAccessorProperty(
-      env->port_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Port, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->pathname_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Pathname, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->search_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Search, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
-      attributes);
-
-  prototype_template->SetAccessorProperty(
-      env->hash_string(),
-      FunctionTemplate::New(
-          isolate, URLPattern::Hash, Local<Value>(), signature),
-      Local<FunctionTemplate>(),
+#define ENV_GETTER(lowercase_name) env->lowercase_name##_string()
+#define URL_PATTERN_COMPONENT_GETTERS(uppercase_name, lowercase_name)          \
+  prototype_template->SetAccessorProperty(                                     \
+      ENV_GETTER(lowercase_name),                                              \
+      FunctionTemplate::New(                                                   \
+          isolate, URLPattern::uppercase_name, Local<Value>(), signature),     \
+      Local<FunctionTemplate>(),                                               \
       attributes);
+  URL_PATTERN_COMPONENTS(URL_PATTERN_COMPONENT_GETTERS)
+#undef URL_PATTERN_COMPONENT_GETTERS
+#undef ENV_GETTER
 
   prototype_template->SetAccessorProperty(
       env->has_regexp_groups_string(),