feat: hasRegExpGroups

denoland · Nov 29, 2023 · 56057da · 56057da
1 parent e65cfc9
commit 56057da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/component.rs b/src/component.rs
@@ -18,6 +18,7 @@ pub(crate) struct Component<R: RegExp> {
   pub regexp: Result<R, Error>,
   pub group_name_list: Vec<String>,
   pub matcher: Matcher<R>,
+  pub has_regexp_group: bool,
 }
 
 impl<R: RegExp> Component<R> {
@@ -46,6 +47,9 @@ impl<R: RegExp> Component<R> {
       regexp,
       group_name_list: name_list,
       matcher,
+      has_regexp_group: part_list
+        .iter()
+        .any(|part| part.kind == PartType::Regexp),
     })
   }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -378,6 +378,18 @@ impl<R: RegExp> UrlPattern<R> {
     &self.hash.pattern_string
   }
 
+  /// Returns whether the URLPattern contains one or more groups which uses regular expression matching.
+  pub fn has_regexp_groups(&self) -> bool {
+    self.protocol.has_regexp_group
+      || self.username.has_regexp_group
+      || self.password.has_regexp_group
+      || self.hostname.has_regexp_group
+      || self.port.has_regexp_group
+      || self.pathname.has_regexp_group
+      || self.search.has_regexp_group
+      || self.hash.has_regexp_group
+  }
+
   // Ref: https://wicg.github.io/urlpattern/#dom-urlpattern-test
   /// Test if a given [UrlPatternInput] (with optional base url), matches the
   /// pattern.

diff --git a/src/quirks.rs b/src/quirks.rs
@@ -79,6 +79,7 @@ pub fn process_construct_pattern_input(
   Ok(init)
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct UrlPattern {
   pub protocol: UrlPatternComponent,
   pub username: UrlPatternComponent,
@@ -88,6 +89,7 @@ pub struct UrlPattern {
   pub pathname: UrlPatternComponent,
   pub search: UrlPatternComponent,
   pub hash: UrlPatternComponent,
+  pub has_regexp_groups: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -186,6 +188,7 @@ impl RegExp for EcmaRegexp {
 pub fn parse_pattern(init: crate::UrlPatternInit) -> Result<UrlPattern, Error> {
   let pattern = crate::UrlPattern::<EcmaRegexp>::parse_internal(init, false)?;
   let urlpattern = UrlPattern {
+    has_regexp_groups: pattern.has_regexp_groups(),
     protocol: pattern.protocol.into(),
     username: pattern.username.into(),
     password: pattern.password.into(),