Unverified Commit c6cec752 authored by Maia Teegarden's avatar Maia Teegarden Committed by GitHub

Fix partial one off global selectors (#29128)

parent e3133984
use easy_error::{bail, Error}; use easy_error::{bail, Error};
use std::panic;
use swc_common::{source_map::Pos, BytePos, Span, SyntaxContext, DUMMY_SP}; use swc_common::{source_map::Pos, BytePos, Span, SyntaxContext, DUMMY_SP};
use swc_css::ast::*; use swc_css::ast::*;
use swc_css::parser::{parse_str, parse_tokens, parser::ParserConfig}; use swc_css::parser::{parse_str, parse_tokens, parser::ParserConfig};
...@@ -102,17 +103,32 @@ impl VisitMut for Namespacer { ...@@ -102,17 +103,32 @@ impl VisitMut for Namespacer {
fn visit_mut_complex_selector(&mut self, node: &mut ComplexSelector) { fn visit_mut_complex_selector(&mut self, node: &mut ComplexSelector) {
let mut new_selectors = vec![]; let mut new_selectors = vec![];
for selector in &node.selectors { for selector in &node.selectors {
let transformed_selectors = self.get_transformed_selectors(selector.clone()); match self.get_transformed_selectors(selector.clone()) {
new_selectors.extend(transformed_selectors); Ok(transformed_selectors) => new_selectors.extend(transformed_selectors),
Err(_) => {
HANDLER.with(|handler| {
handler
.struct_span_err(
selector.span,
"Failed to parse tokens inside one off global selector",
)
.emit()
});
new_selectors.push(selector.clone());
}
};
} }
node.selectors = new_selectors; node.selectors = new_selectors;
} }
} }
impl Namespacer { impl Namespacer {
fn get_transformed_selectors(&mut self, mut node: CompoundSelector) -> Vec<CompoundSelector> { fn get_transformed_selectors(
&mut self,
mut node: CompoundSelector,
) -> Result<Vec<CompoundSelector>, Error> {
if self.is_global { if self.is_global {
return vec![node]; return Ok(vec![node]);
} }
let mut pseudo_index = None; let mut pseudo_index = None;
...@@ -121,16 +137,31 @@ impl Namespacer { ...@@ -121,16 +137,31 @@ impl Namespacer {
// One off global selector // One off global selector
if &name.value == "global" { if &name.value == "global" {
let block_tokens = get_block_tokens(&args); let block_tokens = get_block_tokens(&args);
let mut front_tokens = get_front_selector_tokens(&args);
let mut args = args.clone(); let mut args = args.clone();
args.tokens.extend(block_tokens); front_tokens.extend(args.tokens);
let complex_selectors: Vec<ComplexSelector> = parse_tokens( front_tokens.extend(block_tokens);
&args, args.tokens = front_tokens;
ParserConfig { let complex_selectors = panic::catch_unwind(|| {
parse_values: false, let x: Vec<ComplexSelector> = parse_tokens(
}, &args,
) ParserConfig {
.unwrap(); parse_values: false,
return complex_selectors[0].selectors.clone(); },
)
.unwrap();
return x;
});
return match complex_selectors {
Ok(complex_selectors) => Ok(
complex_selectors[0].selectors[1..]
.iter()
.cloned()
.collect(),
),
Err(_) => bail!("Failed to transform one off global selector"),
};
} else if pseudo_index.is_none() { } else if pseudo_index.is_none() {
pseudo_index = Some(i); pseudo_index = Some(i);
} }
...@@ -156,10 +187,32 @@ impl Namespacer { ...@@ -156,10 +187,32 @@ impl Namespacer {
}), }),
); );
vec![node] Ok(vec![node])
} }
} }
fn get_front_selector_tokens(selector_tokens: &Tokens) -> Vec<TokenAndSpan> {
let start_pos = selector_tokens.span.lo.to_u32() - 2;
vec![
TokenAndSpan {
span: Span {
lo: BytePos(start_pos + 0),
hi: BytePos(start_pos + 1),
ctxt: SyntaxContext::empty(),
},
token: Token::Ident("a".into()),
},
TokenAndSpan {
span: Span {
lo: BytePos(start_pos + 1),
hi: BytePos(start_pos + 2),
ctxt: SyntaxContext::empty(),
},
token: Token::WhiteSpace,
},
]
}
fn get_block_tokens(selector_tokens: &Tokens) -> Vec<TokenAndSpan> { fn get_block_tokens(selector_tokens: &Tokens) -> Vec<TokenAndSpan> {
let start_pos = selector_tokens.span.hi.to_u32(); let start_pos = selector_tokens.span.hi.to_u32();
vec![ vec![
......
export default () => (
<div>
<p>test</p>
<style jsx>{`
.container :global(> *) {
color: red;
}
`}</style>
</div>
)
\ No newline at end of file
import _JSXStyle from "styled-jsx/style";
export default (()=><div className={"jsx-c7c3a8e231c9215a"}>
<p className={"jsx-c7c3a8e231c9215a"}>test</p>
<_JSXStyle id={"c7c3a8e231c9215a"}>{".container.jsx-c7c3a8e231c9215a >* {color:red}"}</_JSXStyle>
</div>
);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment