klenod-plugin-css 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9e3fe98450972c6f0825c8ccdf9f23d26162db9b18560ad35f930d91334884f
-  data.tar.gz: a283148002690eba149aa940a64082acefd568f3dc3bc761ea17edac4f6e20b7
+  metadata.gz: 7b13de3963f22c51b7e0120f155bc389ef1cf1e8082458a91abeb2b7e2c82e9d
+  data.tar.gz: 9676ca08656ab9dc39a9f5d141a81dea3f56d14d970575c81ab00144e343606e
 SHA512:
-  metadata.gz: 20fbf9a420b2a85ef2b4c028157d6e2550b12911a1241cd34e084bda51f0e6d06b240ff02ac89cb7ad8a356e6e34fce02aa03dfe948f1d3d9d3da767b8c2c0c1
-  data.tar.gz: 64e8ee0a3b850c4abb12f8dbb2ce13b028ec994c637389ce3c73ef9b71e53efa214c51cc0934b7fc52faebe68c3b45ddbf79f1a9c496793a52f170b384be5e52
+  metadata.gz: 0a5b302cf09d805adb6ab2b4ad00a57807d910c1c12b51ecdc928dfbb86881d673514d940d8e33437ccb7549d1728adec007002064c44425d0558eab86a55bab
+  data.tar.gz: c7a69fe8402e101ca5ef3ac2fd0477cf2e1dc49b38629ddf4e3864d31af4c854e09d4fea31a0260ec8079d1a4cfab0118055ca19d8ed5acc336be140488d4a21

data/ext/native/Cargo.lock

@@ -556,9 +556,9 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "magnus"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c01bef153b8d0f086991f0e166474a1d57b738221f9a9c11405d498ac95a44d"
+checksum = "40ef424404d166cbb71c8b8d19c9c589c748c4547c1afa1928c5504299f6c713"
 dependencies = [
  "magnus-macros",
  "rb-sys",
@@ -603,6 +603,7 @@ dependencies = [
  "cssparser 0.38.0",
  "lightningcss",
  "magnus",
+ "parcel_selectors",
  "parcel_sourcemap",
  "serde_json",
  "sha2",
@@ -1085,9 +1086,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1098,9 +1099,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
 dependencies = [
  "cfg-if",
  "cpufeatures",

data/ext/native/Cargo.toml

@@ -10,8 +10,9 @@ crate-type = ["cdylib"]
 [dependencies]
 base64 = "0.23.1"
 cssparser = "0.38.0"
-lightningcss = { version = "1.0.0-alpha.70", features = ["serde", "visitor", "sourcemap"] }
+lightningcss = { version = "1.0.0-alpha.72", features = ["serde", "visitor", "sourcemap"] }
 magnus = "0.9.1"
+parcel_selectors = "0.28.3"
 parcel_sourcemap = { version = "2.1.1", features = ["json"] }
 serde_json = "1.0.149"
 sha2 = "0.11.0"

data/ext/native/src/lib.rs

@@ -1,7 +1,7 @@
 use lightningcss::dependencies::DependencyOptions;
 use lightningcss::{
     properties::{css_modules::Specifier, custom::Variable},
-    selector::{Component, Selector},
+    selector::{Component, PseudoClass, Selector},
     stylesheet::{MinifyOptions, ParserOptions, PrinterOptions, StyleSheet},
     values::ident::DashedIdent,
     visitor::{Visit, VisitTypes, Visitor},
@@ -10,6 +10,7 @@ use magnus::{
     exception::ExceptionClass, function, gc::register_mark_object, prelude::*, value::Lazy, Error,
     RHash, RModule, Ruby, TryConvert,
 };
+use parcel_selectors::parser::NthOfSelectorData;
 use parcel_sourcemap::SourceMap;
 use std::{collections::HashMap, convert::Infallible};
 
@@ -56,38 +57,7 @@ impl<'a, 'i> Visitor<'i> for TransformNamesVisitor<'a> {
     }
 
     fn visit_selector(&mut self, selector: &mut Selector<'i>) -> Result<(), Self::Error> {
-        for component in selector.iter_mut_raw_match_order() {
-            match component {
-                Component::Class(class_name) => {
-                    let original = class_name.to_string();
-                    let formatted = format_selector(
-                        &self.options.class_pattern,
-                        &self.options.component,
-                        &original,
-                        &self.options.hash,
-                    );
-                    self.classes.insert(original, formatted.clone());
-                    if self.options.transform_names {
-                        *component = Component::Class(formatted.into());
-                    }
-                }
-                Component::LocalName(local_name) => {
-                    let original = local_name.name.to_string();
-                    let formatted = format_selector(
-                        &self.options.tag_pattern,
-                        &self.options.component,
-                        &original,
-                        &self.options.hash,
-                    );
-                    self.elements.insert(original, formatted.clone());
-                    if self.options.transform_names {
-                        *component = Component::Class(formatted.into());
-                    }
-                }
-                _ => {}
-            }
-        }
-
+        self.transform_selector(selector);
         Ok(())
     }
 
@@ -125,6 +95,68 @@ impl<'a, 'i> Visitor<'i> for TransformNamesVisitor<'a> {
     }
 }
 
+impl<'a> TransformNamesVisitor<'a> {
+    // Nested selector lists such as `:is(h1, .title)` and `:not(.kicker)` are
+    // scoped like the outer selector. `:global(...)` stays unscoped, and
+    // `::cue(...)` is left alone because it matches WebVTT cue classes rather
+    // than document classes.
+    fn transform_selector<'i>(&mut self, selector: &mut Selector<'i>) {
+        for component in selector.iter_mut_raw_match_order() {
+            match component {
+                Component::Negation(selectors)
+                | Component::Is(selectors)
+                | Component::Where(selectors)
+                | Component::Has(selectors)
+                | Component::Any(_, selectors) => {
+                    for nested in selectors.iter_mut() {
+                        self.transform_selector(nested);
+                    }
+                }
+                Component::Slotted(nested) | Component::Host(Some(nested)) => {
+                    self.transform_selector(nested);
+                }
+                Component::NthOf(data) => {
+                    let mut selectors = data.clone_selectors();
+                    for nested in selectors.iter_mut() {
+                        self.transform_selector(nested);
+                    }
+                    *data = NthOfSelectorData::new(*data.nth_data(), selectors);
+                }
+                Component::NonTSPseudoClass(PseudoClass::Local { selector: nested }) => {
+                    self.transform_selector(nested);
+                }
+                Component::Class(class_name) => {
+                    let original = class_name.to_string();
+                    let formatted = format_selector(
+                        &self.options.class_pattern,
+                        &self.options.component,
+                        &original,
+                        &self.options.hash,
+                    );
+                    self.classes.insert(original, formatted.clone());
+                    if self.options.transform_names {
+                        *component = Component::Class(formatted.into());
+                    }
+                }
+                Component::LocalName(local_name) => {
+                    let original = local_name.name.to_string();
+                    let formatted = format_selector(
+                        &self.options.tag_pattern,
+                        &self.options.component,
+                        &original,
+                        &self.options.hash,
+                    );
+                    self.elements.insert(original, formatted.clone());
+                    if self.options.transform_names {
+                        *component = Component::Class(formatted.into());
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
 fn transform_native(
     ruby: &Ruby,
     source: String,

data/lib/klenod/plugin/css/version.rb

@@ -4,7 +4,7 @@ module Klenod
   module Build
     module Plugins
       module CSSPlugin
-        VERSION = "0.0.32"
+        VERSION = "0.0.33"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-css
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.0.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.0.33
 - !ruby/object:Gem::Dependency
   name: rb_sys
   requirement: !ruby/object:Gem::Requirement