Merge pull request #3529 from cloudflare/yagiz/replace-urlpattern

use ada-url's url_pattern implementation

Author: anonrig

src/workerd/api/BUILD.bazel

@@ -24,6 +24,7 @@ filegroup(
             "rtti.c++",
             "url.c++",
             "urlpattern.c++",
+            "urlpattern-standard.c++",
             "util.c++",
         ],
     ),
@@ -49,6 +50,7 @@ filegroup(
             "rtti.h",
             "url.h",
             "urlpattern.h",
+            "urlpattern-standard.h",
             "util.h",
         ],
     ),
@@ -249,6 +251,18 @@ wd_cc_library(
     ],
 )
 
+wd_cc_library(
+    name = "urlpattern-standard",
+    srcs = ["urlpattern-standard.c++"],
+    hdrs = ["urlpattern-standard.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/workerd/jsg",
+        "@ada-url",
+        "@capnp-cpp//src/kj",
+    ],
+)
+
 ####################################################################################################
 ## Tests
 

src/workerd/api/api-rtti-test.c++

@@ -19,10 +19,14 @@
 #include <workerd/api/streams/standard.h>
 #include <workerd/api/trace.h>
 #include <workerd/api/url-standard.h>
+#include <workerd/api/urlpattern-standard.h>
 #include <workerd/api/urlpattern.h>
 #include <workerd/io/compatibility-date.h>
 #include <workerd/jsg/rtti.h>
 
+// TODO(soon): Remove this once URLPattern autogate has been removed.
+#include <workerd/util/autogate.h>
+
 #include <kj/test.h>
 
 // Test building rtti for various APIs.
@@ -31,13 +35,15 @@ namespace workerd::api {
 namespace {
 
 KJ_TEST("WorkerGlobalScope") {
+  util::Autogate::initAutogate({});
   jsg::rtti::Builder builder((CompatibilityFlags::Reader()));
   builder.structure<WorkerGlobalScope>();
   KJ_EXPECT(builder.structure("workerd::api::Event"_kj) != kj::none);
   KJ_EXPECT(builder.structure("workerd::api::ObviouslyWrongName"_kj) == kj::none);
 }
 
 KJ_TEST("ServiceWorkerGlobalScope") {
+  util::Autogate::initAutogate({});
   jsg::rtti::Builder builder((CompatibilityFlags::Reader()));
   builder.structure<ServiceWorkerGlobalScope>();
   KJ_EXPECT(builder.structure("workerd::api::DurableObjectId"_kj) != kj::none);

src/workerd/api/global-scope.h

@@ -10,6 +10,7 @@
 
 #include <workerd/io/io-timers.h>
 #include <workerd/jsg/jsg.h>
+#include <workerd/util/autogate.h>
 #ifdef WORKERD_EXPERIMENTAL_ENABLE_WEBGPU
 #include <workerd/api/gpu/gpu.h>
 #endif
@@ -52,11 +53,15 @@ class CompressionStream;
 class DecompressionStream;
 class TextEncoderStream;
 class TextDecoderStream;
-class URLPattern;
 class Blob;
 class File;
 class FormData;
 
+class URLPattern;
+namespace urlpattern {
+class URLPattern;
+}  // namespace urlpattern
+
 class URL;
 class URLSearchParams;
 namespace url {
@@ -709,7 +714,13 @@ class ServiceWorkerGlobalScope: public WorkerGlobalScope {
       JSG_NESTED_TYPE(URL);
       JSG_NESTED_TYPE(URLSearchParams);
     }
-    JSG_NESTED_TYPE(URLPattern);
+
+    // We conditionally enable a more spec compliant URLPattern to avoid any breakages.
+    if (util::Autogate::isEnabled(util::AutogateKey::URLPATTERN)) {
+      JSG_NESTED_TYPE_NAMED(urlpattern::URLPattern, URLPattern);
+    } else {
+      JSG_NESTED_TYPE(URLPattern);
+    }
 
     JSG_NESTED_TYPE(Blob);
     JSG_NESTED_TYPE(File);

src/workerd/api/rtti.c++

@@ -30,6 +30,7 @@
 #include <workerd/api/trace.h>
 #include <workerd/api/unsafe.h>
 #include <workerd/api/url-standard.h>
+#include <workerd/api/urlpattern-standard.h>
 #include <workerd/api/urlpattern.h>
 #include <workerd/api/worker-rpc.h>
 #include <workerd/io/compatibility-date.h>
@@ -76,6 +77,7 @@
   F("url", EW_URL_ISOLATE_TYPES)                                                                   \
   F("url-standard", EW_URL_STANDARD_ISOLATE_TYPES)                                                 \
   F("url-pattern", EW_URLPATTERN_ISOLATE_TYPES)                                                    \
+  F("url-pattern-standard", EW_URLPATTERN_STANDARD_ISOLATE_TYPES)                                  \
   F("websocket", EW_WEBSOCKET_ISOLATE_TYPES)                                                       \
   F("sql", EW_SQL_ISOLATE_TYPES)                                                                   \
   F("sockets", EW_SOCKETS_ISOLATE_TYPES)                                                           \