refactor(css/parser): Improve project structure (#6110)

swc-project · Oct 18, 2022 · 6e2e2ad · 6e2e2ad · github-actions · Oct 18, 2022
1 parent 4cd7efc
commit 6e2e2ad
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/crates/swc_css_parser/src/parser/at_rule.rs → ...swc_css_parser/src/parser/at_rules/mod.rs b/crates/swc_css_parser/src/parser/at_rule.rs → ...swc_css_parser/src/parser/at_rules/mod.rs
@@ -4,7 +4,7 @@ use swc_css_ast::*;
 use super::{input::ParserInput, PResult, Parser};
 use crate::{
     error::{Error, ErrorKind},
-    parser::{value::is_math_function, BlockContentsGrammar, Ctx},
+    parser::{values_and_units::is_math_function, BlockContentsGrammar, Ctx},
     Parse,
 };
 

diff --git a/crates/swc_css_parser/src/parser/mod.rs b/crates/swc_css_parser/src/parser/mod.rs
@@ -8,14 +8,14 @@ use crate::{error::Error, Parse};
 
 #[macro_use]
 mod macros;
-mod at_rule;
-mod base;
+mod at_rules;
 pub mod input;
-mod selector;
+mod selectors;
+mod syntax;
 #[cfg(test)]
 mod tests;
 mod util;
-mod value;
+mod values_and_units;
 
 pub type PResult<T> = Result<T, Error>;
 

diff --git a/crates/swc_css_parser/src/parser/selector/tests.rs b/crates/swc_css_parser/src/parser/selector/tests.rs
diff --git a/...swc_css_parser/src/parser/selector/mod.rs → ...wc_css_parser/src/parser/selectors/mod.rs b/...swc_css_parser/src/parser/selector/mod.rs → ...wc_css_parser/src/parser/selectors/mod.rs
diff --git a/crates/swc_css_parser/src/parser/base.rs → ...s/swc_css_parser/src/parser/syntax/mod.rs b/crates/swc_css_parser/src/parser/base.rs → ...s/swc_css_parser/src/parser/syntax/mod.rs
diff --git a/crates/swc_css_parser/src/parser/value/tests.rs b/crates/swc_css_parser/src/parser/value/tests.rs
diff --git a/...es/swc_css_parser/src/parser/value/mod.rs → ...parser/src/parser/values_and_units/mod.rs b/...es/swc_css_parser/src/parser/value/mod.rs → ...parser/src/parser/values_and_units/mod.rs
@@ -6,8 +6,6 @@ use crate::{
     error::{Error, ErrorKind},
     Parse,
 };
-#[cfg(test)]
-mod tests;
 
 impl<I> Parser<I>
 where
Benchmark suite	Current: `6e2e2ad`	Previous: `5571c0c`	Ratio
`es/full/minify/libraries/antd`	`1867527037` ns/iter (`± 18549169`)	`1738436473` ns/iter (`± 43001236`)	`1.07`
`es/full/minify/libraries/d3`	`425940894` ns/iter (`± 19088614`)	`407545338` ns/iter (`± 38618226`)	`1.05`
`es/full/minify/libraries/echarts`	`1524438878` ns/iter (`± 22565698`)	`1508277781` ns/iter (`± 32292965`)	`1.01`
`es/full/minify/libraries/jquery`	`107901458` ns/iter (`± 15189026`)	`101713229` ns/iter (`± 7236603`)	`1.06`
`es/full/minify/libraries/lodash`	`111339115` ns/iter (`± 1283262`)	`128533366` ns/iter (`± 13463964`)	`0.87`
`es/full/minify/libraries/moment`	`57658064` ns/iter (`± 3177173`)	`61125493` ns/iter (`± 6934638`)	`0.94`
`es/full/minify/libraries/react`	`20154312` ns/iter (`± 997548`)	`22546022` ns/iter (`± 1783689`)	`0.89`
`es/full/minify/libraries/terser`	`312676082` ns/iter (`± 14360050`)	`336585087` ns/iter (`± 11097788`)	`0.93`
`es/full/minify/libraries/three`	`590028892` ns/iter (`± 20425854`)	`535459828` ns/iter (`± 9773021`)	`1.10`
`es/full/minify/libraries/typescript`	`3527185352` ns/iter (`± 92581466`)	`3360677952` ns/iter (`± 100746693`)	`1.05`
`es/full/minify/libraries/victory`	`833600869` ns/iter (`± 48473470`)	`860272756` ns/iter (`± 307288267`)	`0.97`
`es/full/minify/libraries/vue`	`149825384` ns/iter (`± 17341198`)	`168109641` ns/iter (`± 27485653`)	`0.89`
`es/full/codegen/es3`	`34039` ns/iter (`± 1787`)	`34722` ns/iter (`± 1401`)	`0.98`
`es/full/codegen/es5`	`33348` ns/iter (`± 752`)	`33717` ns/iter (`± 4714`)	`0.99`
`es/full/codegen/es2015`	`33275` ns/iter (`± 559`)	`33212` ns/iter (`± 642`)	`1.00`
`es/full/codegen/es2016`	`33415` ns/iter (`± 1058`)	`33465` ns/iter (`± 1301`)	`1.00`
`es/full/codegen/es2017`	`33362` ns/iter (`± 1378`)	`33802` ns/iter (`± 5744`)	`0.99`
`es/full/codegen/es2018`	`33703` ns/iter (`± 2654`)	`33398` ns/iter (`± 1101`)	`1.01`
`es/full/codegen/es2019`	`33406` ns/iter (`± 1448`)	`33402` ns/iter (`± 867`)	`1.00`
`es/full/codegen/es2020`	`33418` ns/iter (`± 1468`)	`33311` ns/iter (`± 1279`)	`1.00`
`es/full/all/es3`	`208254443` ns/iter (`± 15742664`)	`211963740` ns/iter (`± 29065958`)	`0.98`
`es/full/all/es5`	`195992163` ns/iter (`± 17770594`)	`191002111` ns/iter (`± 31450852`)	`1.03`
`es/full/all/es2015`	`147754942` ns/iter (`± 11669687`)	`150678918` ns/iter (`± 9518374`)	`0.98`
`es/full/all/es2016`	`155161830` ns/iter (`± 26631717`)	`181957349` ns/iter (`± 30727350`)	`0.85`
`es/full/all/es2017`	`160814865` ns/iter (`± 17115620`)	`175693868` ns/iter (`± 19397752`)	`0.92`
`es/full/all/es2018`	`163264313` ns/iter (`± 14662707`)	`143224221` ns/iter (`± 13996092`)	`1.14`
`es/full/all/es2019`	`144823174` ns/iter (`± 8820540`)	`146807423` ns/iter (`± 17197445`)	`0.99`
`es/full/all/es2020`	`149347533` ns/iter (`± 15199440`)	`160208479` ns/iter (`± 24574098`)	`0.93`
`es/full/parser`	`757933` ns/iter (`± 112367`)	`719417` ns/iter (`± 47384`)	`1.05`
`es/full/base/fixer`	`27167` ns/iter (`± 2468`)	`27049` ns/iter (`± 5376`)	`1.00`
`es/full/base/resolver_and_hygiene`	`96355` ns/iter (`± 5805`)	`92911` ns/iter (`± 11027`)	`1.04`
`serialization of ast node`	`208` ns/iter (`± 11`)	`212` ns/iter (`± 18`)	`0.98`
`serialization of serde`	`212` ns/iter (`± 16`)	`218` ns/iter (`± 28`)	`0.97`