feat: 调整代码

luckyadam · luckyadam · commit 9c5f5d7b2f12 · 2023-10-10T20:52:23.000+08:00
diff --git a/README.md b/README.md
@@ -15,11 +15,13 @@
 ## 功能特性
 
 ### JSX DOM 树构造
+
 - [x] 支持函数组件
 - [x] 支持类组件
 - [x] 支持 JSX 分离的写法
 - [ ] 支持遍历子组件
 
 ### 样式计算
+
 - [x] 样式层叠
 - [x] 样式继承
diff --git a/npm/android-arm-eabi/package.json b/npm/android-arm-eabi/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/darwin-universal/package.json b/npm/darwin-universal/package.json
@@ -13,4 +13,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/freebsd-x64/package.json b/npm/freebsd-x64/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/linux-arm-gnueabihf/package.json b/npm/linux-arm-gnueabihf/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json
@@ -19,4 +19,4 @@
     "glibc"
   ],
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/linux-arm64-musl/package.json b/npm/linux-arm64-musl/package.json
@@ -19,4 +19,4 @@
     "musl"
   ],
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -19,4 +19,4 @@
     "glibc"
   ],
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -19,4 +19,4 @@
     "musl"
   ],
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/win32-arm64-msvc/package.json b/npm/win32-arm64-msvc/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/win32-ia32-msvc/package.json b/npm/win32-ia32-msvc/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -16,4 +16,4 @@
     "node": ">= 10"
   },
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
-}
+}
diff --git a/src/document.rs b/src/document.rs
@@ -1,12 +1,19 @@
 use std::collections::HashMap;
 
 use ego_tree::Tree;
-use swc_common::{sync::Lrc, SourceMap, errors::{Handler, ColorConfig}};
+use swc_common::{
+  errors::{ColorConfig, Handler},
+  sync::Lrc,
+  SourceMap,
+};
 use swc_ecma_ast::{EsVersion, Module};
-use swc_ecma_parser::{lexer::Lexer, Syntax, TsConfig, StringInput, Parser};
+use swc_ecma_parser::{lexer::Lexer, Parser, StringInput, Syntax, TsConfig};
 use swc_ecma_visit::VisitWith;
 
-use crate::{scraper::{Node, Selector, ElementRef}, visitor::{AstVisitor, JSXRecord}};
+use crate::{
+  scraper::{ElementRef, Node, Selector},
+  visitor::{AstVisitor, JSXRecord},
+};
 
 pub struct JSXDocument {
   pub tree: Tree<Node>,
@@ -27,30 +34,20 @@ impl JSXDocument {
     // 初始化 swc 的 SourceMap
     let cm: Lrc<SourceMap> = Default::default();
     // 初始化 swc 的错误处理器
-    let handler = Handler::with_tty_emitter(
-      ColorConfig::Auto,
-      true,
-      false,
-      Some(cm.clone()),
-    );
+    let handler = Handler::with_tty_emitter(ColorConfig::Auto, true, false, Some(cm.clone()));
 
     // 将 JSX 代码转换为 SourceFile
-    let fm = cm.new_source_file(
-      swc_common::FileName::Anon,
-      jsx,
-    );
+    let fm = cm.new_source_file(swc_common::FileName::Anon, jsx);
 
     // 初始化 swc 的词法分析器
     let lexer = Lexer::new(
-      Syntax::Typescript(
-        TsConfig {
-          tsx: true,
-          ..Default::default()
-        }
-      ),
+      Syntax::Typescript(TsConfig {
+        tsx: true,
+        ..Default::default()
+      }),
       EsVersion::Es2019,
       StringInput::from(&*fm),
-      None
+      None,
     );
     // 初始化 swc 的语法分析器
     let mut parser = Parser::new_from(lexer);
@@ -60,10 +57,8 @@ impl JSXDocument {
 
     let module = parser
       .parse_module()
-      .map_err(|e| {
-        e.into_diagnostic(&handler).emit()
-      })
-      .expect("failed to parser module");
+      .map_err(|e| e.into_diagnostic(&handler).emit())
+      .expect("解析 JSX 失败");
     let mut jsx_record: JSXRecord = HashMap::new();
     let mut vistor = AstVisitor::new(&module, &mut self.tree, &mut jsx_record);
     module.visit_with(&mut vistor);
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(clippy::all)]
 
-use std::{rc::Rc, cell::RefCell};
+use std::{cell::RefCell, rc::Rc};
 
-use swc_common::{SourceMap, comments::SingleThreadedComments};
+use swc_common::{comments::SingleThreadedComments, SourceMap};
 use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
 
 use crate::{document::JSXDocument, style_parser::StyleParser, style_write::StyleWrite};
@@ -12,34 +12,34 @@ extern crate napi_derive;
 
 mod document;
 mod scraper;
-mod utils;
-mod visitor;
 mod style_parser;
 mod style_write;
+mod utils;
+mod visitor;
 
 #[napi]
 pub fn parse(component: String, styles: Vec<String>) -> String {
-	// 解析组件文件
+  // 解析组件文件
   let mut document = JSXDocument::new();
   document.parse(component);
 
-	// 解析样式文件
-	let css = styles.join("\n");
-	let mut style_parser = StyleParser::new(&document);
+  // 解析样式文件
+  let css = styles.join("\n");
+  let mut style_parser = StyleParser::new(&document);
   style_parser.parse(&css);
   let style_record = style_parser.calc();
 
-	let module = Rc::new(RefCell::new(document.module.as_ref().unwrap().clone()));
+  let module = Rc::new(RefCell::new(document.module.as_ref().unwrap().clone()));
   let jsx_record = Rc::new(RefCell::new(document.jsx_record.as_ref().unwrap().clone()));
   let style_record = Rc::new(RefCell::new(style_record));
   let mut style_write = StyleWrite::new(module.clone(), jsx_record.clone(), style_record.clone());
   style_write.write();
 
-	// ast 转代码
-	let cm = Rc::new(SourceMap::default());
+  // ast 转代码
+  let cm = Rc::new(SourceMap::default());
   let comments = SingleThreadedComments::default();
 
-	let mut buf = Vec::new();
+  let mut buf = Vec::new();
   {
     let writer = Box::new(JsWriter::new(cm.clone(), "\n", &mut buf, None));
     let mut emitter = Emitter {
diff --git a/src/scraper.rs b/src/scraper.rs
diff --git a/src/style_parser.rs b/src/style_parser.rs
diff --git a/src/style_write.rs b/src/style_write.rs
diff --git a/src/utils.rs b/src/utils.rs
diff --git a/src/visitor.rs b/src/visitor.rs

-Original file line number
+Diff line change
     "glibc"
   ],
   "repository": "https://github.com/NervJS/parse-css-to-stylesheet"
 -}
 +}