Split selector lists when some selectors aren't supported by targets

Fixes parcel-bundler#311

Author: devongovett

node/src/at_rule_parser.rs

@@ -49,7 +49,7 @@ pub struct Prelude<'i> {
   prelude: Option<ParsedComponent<'i>>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct AtRule<'i> {
   #[serde(borrow)]
   pub name: CowArcStr<'i>,
@@ -58,7 +58,7 @@ pub struct AtRule<'i> {
   pub loc: Location,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(tag = "type", content = "value", rename_all = "kebab-case")]
 pub enum AtRuleBody<'i> {
   #[serde(borrow)]

node/test/composeVisitors.test.mjs

@@ -510,6 +510,9 @@ test('known rules', () => {
         margin-right: @margin-left;
       }
     `),
+    targets: {
+      safari: 14 << 16
+    },
     visitor: composeVisitors([
       {
         Rule: {

node/test/visitor.test.mjs

@@ -401,6 +401,9 @@ test('focus visible', () => {
         color: red;
       }
     `),
+    targets: {
+      safari: 14 << 16
+    },
     visitor: {
       Rule: {
         style(rule) {

src/bundler.rs

@@ -218,7 +218,7 @@ impl<'a, 'o, 's, P: SourceProvider> Bundler<'a, 'o, 's, P, DefaultAtRuleParser>
 
 impl<'a, 'o, 's, P: SourceProvider, T: AtRuleParser<'a> + Clone + Sync + Send> Bundler<'a, 'o, 's, P, T>
 where
-  T::AtRule: Sync + Send + ToCss,
+  T::AtRule: Sync + Send + ToCss + Clone,
 {
   /// Creates a new Bundler using the given source provider.
   /// If a source map is given, the content of each source file included in the bundle will

src/context.rs

@@ -65,7 +65,7 @@ impl<'i, 'o> PropertyHandlerContext<'i, 'o> {
     self.rtl.push(rtl);
   }
 
-  pub fn get_logical_rules<T>(&mut self, style_rule: &StyleRule<'i, T>) -> Vec<CssRule<'i, T>> {
+  pub fn get_logical_rules<T>(&self, style_rule: &StyleRule<'i, T>) -> Vec<CssRule<'i, T>> {
     // TODO: :dir/:lang raises the specificity of the selector. Use :where to lower it?
     let mut dest = Vec::new();
 
@@ -82,7 +82,7 @@ impl<'i, 'o> PropertyHandlerContext<'i, 'o> {
           selectors,
           vendor_prefix: VendorPrefix::None,
           declarations: DeclarationBlock {
-            declarations: std::mem::take(&mut self.$decls),
+            declarations: self.$decls.clone(),
             important_declarations: vec![],
           },
           rules: CssRuleList(vec![]),
@@ -148,22 +148,21 @@ impl<'i, 'o> PropertyHandlerContext<'i, 'o> {
     }
   }
 
-  pub fn get_supports_rules<T>(&mut self, style_rule: &StyleRule<'i, T>) -> Vec<CssRule<'i, T>> {
+  pub fn get_supports_rules<T>(&self, style_rule: &StyleRule<'i, T>) -> Vec<CssRule<'i, T>> {
     if self.supports.is_empty() {
       return Vec::new();
     }
 
     let mut dest = Vec::new();
-    let supports = std::mem::take(&mut self.supports);
-    for entry in supports {
+    for entry in &self.supports {
       dest.push(CssRule::Supports(SupportsRule {
-        condition: entry.condition,
+        condition: entry.condition.clone(),
         rules: CssRuleList(vec![CssRule::Style(StyleRule {
           selectors: style_rule.selectors.clone(),
           vendor_prefix: VendorPrefix::None,
           declarations: DeclarationBlock {
-            declarations: entry.declarations,
-            important_declarations: entry.important_declarations,
+            declarations: entry.declarations.clone(),
+            important_declarations: entry.important_declarations.clone(),
           },
           rules: CssRuleList(vec![]),
           loc: style_rule.loc.clone(),
@@ -174,4 +173,10 @@ impl<'i, 'o> PropertyHandlerContext<'i, 'o> {
 
     dest
   }
+
+  pub fn reset(&mut self) {
+    self.supports.clear();
+    self.ltr.clear();
+    self.rtl.clear();
+  }
 }

src/lib.rs

@@ -8691,11 +8691,7 @@ mod tests {
       }
     "#,
       indoc! {r#"
-      [foo="bar"] {
-        color: red;
-      }
-
-      .bar {
+      [foo="bar"], .bar {
         color: red;
       }
     "#},
@@ -9335,6 +9331,174 @@ mod tests {
       }
       "#},
     );
+
+    prefix_test(
+      r#"
+      :hover, :focus-visible {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      :hover {
+        color: red;
+      }
+
+      :focus-visible {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(13 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      .foo {
+        color: red;
+      }
+
+      :hover, :focus-visible {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      .foo, :hover {
+        color: red;
+      }
+
+      :focus-visible {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(13 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      :hover, :focus-visible {
+        margin-inline-start: 24px;
+      }
+      "#,
+      indoc! {r#"
+      :hover:not(:lang(ae, ar, arc, bcc, bqi, ckb, dv, fa, glk, he, ku, mzn, nqo, pnb, ps, sd, ug, ur, yi)) {
+        margin-left: 24px;
+      }
+
+      :hover:lang(ae, ar, arc, bcc, bqi, ckb, dv, fa, glk, he, ku, mzn, nqo, pnb, ps, sd, ug, ur, yi) {
+        margin-right: 24px;
+      }
+
+      :focus-visible:not(:lang(ae, ar, arc, bcc, bqi, ckb, dv, fa, glk, he, ku, mzn, nqo, pnb, ps, sd, ug, ur, yi)) {
+        margin-left: 24px;
+      }
+
+      :focus-visible:lang(ae, ar, arc, bcc, bqi, ckb, dv, fa, glk, he, ku, mzn, nqo, pnb, ps, sd, ug, ur, yi) {
+        margin-right: 24px;
+      }
+      "#},
+      Browsers {
+        safari: Some(11 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      :focus-within, :focus-visible {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      :focus-within {
+        color: red;
+      }
+
+      :focus-visible {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(9 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      :hover, :focus-visible {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      :is(:hover, :focus-visible) {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(14 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      a::after:hover, a::after:focus-visible {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      a:after:hover {
+        color: red;
+      }
+
+      a:after:focus-visible {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(14 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      a:not(:hover), a:not(:focus-visible) {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      :is(a:not(:hover), a:not(:focus-visible)) {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(14 << 16),
+        ..Browsers::default()
+      },
+    );
+
+    prefix_test(
+      r#"
+      a:has(:hover), a:has(:focus-visible) {
+        color: red;
+      }
+      "#,
+      indoc! {r#"
+      :is(a:has(:hover), a:has(:focus-visible)) {
+        color: red;
+      }
+      "#},
+      Browsers {
+        safari: Some(14 << 16),
+        ..Browsers::default()
+      },
+    );
   }
 
   #[test]

src/rules/container.rs

@@ -271,7 +271,7 @@ impl<'i> ToCss for ContainerName<'i> {
   }
 }
 
-impl<'i, T> ContainerRule<'i, T> {
+impl<'i, T: Clone> ContainerRule<'i, T> {
   pub(crate) fn minify(
     &mut self,
     context: &mut MinifyContext<'_, 'i>,

src/rules/document.rs

@@ -26,7 +26,7 @@ pub struct MozDocumentRule<'i, R = DefaultAtRule> {
   pub loc: Location,
 }
 
-impl<'i, T> MozDocumentRule<'i, T> {
+impl<'i, T: Clone> MozDocumentRule<'i, T> {
   pub(crate) fn minify(&mut self, context: &mut MinifyContext<'_, 'i>) -> Result<(), MinifyError> {
     self.rules.minify(context, false)
   }

src/rules/layer.rs

@@ -128,7 +128,7 @@ pub struct LayerBlockRule<'i, R = DefaultAtRule> {
   pub loc: Location,
 }
 
-impl<'i, T> LayerBlockRule<'i, T> {
+impl<'i, T: Clone> LayerBlockRule<'i, T> {
   pub(crate) fn minify(
     &mut self,
     context: &mut MinifyContext<'_, 'i>,

src/rules/media.rs

@@ -26,7 +26,7 @@ pub struct MediaRule<'i, R = DefaultAtRule> {
   pub loc: Location,
 }
 
-impl<'i, T> MediaRule<'i, T> {
+impl<'i, T: Clone> MediaRule<'i, T> {
   pub(crate) fn minify(
     &mut self,
     context: &mut MinifyContext<'_, 'i>,