feat: 将处理动态类的方法踢出去

Author: luckyadam

__test__/index.spec.mjs.md

@@ -10,6 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `import React from 'react';␊
     import './Mod.scss';␊
+    import { calcDynamicStyle as calcDynamicStyle } from "@tarojs/runtime";␊
     var __inner_style__ = {␊
         "cnt_col": {␊
             display: "flex",␊
@@ -158,17 +159,6 @@ Generated by [AVA](https://avajs.dev).
             display: "inline-flex"␊
         }␊
     };␊
-    function __calc_style__(classnames, styleObj) {␊
-        var styleObjs = [];␊
-        var classes = classnames.split(' ');␊
-        for(var i = 0; i < classes.length; i++){␊
-            styleObjs.push(classes[i] in window.__inner_style__ ? window.__inner_style__[classes[i]] : {});␊
-        }␊
-        styleObjs.push(styleObj);␊
-        return Object.assign.apply(null, [␊
-            {}␊
-        ].concat(styleObjs));␊
-    }␊
     function Cc() {␊
         return <div className='cc'>␊
     ␊
@@ -242,7 +232,7 @@ Generated by [AVA](https://avajs.dev).
                 height: 800␊
             }}>␊
     ␊
-            <div className={classnames('cnt_row')} style={__calc_style__(classnames('cnt_row'), null)}>␊
+            <div className={classnames('cnt_row')} style={calcDynamicStyle(__inner_style__, classnames('cnt_row'), null)}>␊
     ␊
               <>␊
     ␊

__test__/index.spec.mjs.snap

@@ -1,12 +1,6 @@
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
 
-use swc_common::{
-  errors::{ColorConfig, Handler},
-  sync::Lrc,
-  SourceMap,
-};
 use swc_ecma_ast::Program;
-use swc_ecma_parser::{lexer::Lexer, Parser, StringInput, Syntax};
 use swc_ecma_visit::VisitMutWith;
 
 use crate::{
@@ -37,33 +31,6 @@ impl<'i> StyleWrite<'i> {
   }
 
   pub fn write(&mut self) {
-    let insert_code = "
-function __calc_style__(classnames, styleObj) {
-  var styleObjs = [];
-  var classes = classnames.split(' ');
-  for (var i = 0; i < classes.length; i++) {
-    styleObjs.push(classes[i] in window.__inner_style__ ? window.__inner_style__[classes[i]] : {});
-  }
-  styleObjs.push(styleObj);
-  return Object.assign.apply(null, [{}].concat(styleObjs));
-}
-    ";
-    let cm: Lrc<SourceMap> = Default::default();
-    let fm = cm.new_source_file(swc_common::FileName::Anon, insert_code.to_string());
-    let handler = Handler::with_tty_emitter(ColorConfig::Auto, true, false, Some(cm.clone()));
-    let lexer = Lexer::new(
-      Syntax::default(),
-      Default::default(),
-      StringInput::from(&*fm),
-      None,
-    );
-    let mut parser = Parser::new_from(lexer);
-    let insert_module = Rc::new(RefCell::new(
-      parser
-        .parse_module()
-        .map_err(|e| e.into_diagnostic(&handler).emit())
-        .expect("解析插入代码失败"),
-    ));
     {
       let mut jsx_mut_visitor =
         JSXMutVisitor::new(self.jsx_record.clone(), self.style_record.clone());
@@ -73,8 +40,7 @@ function __calc_style__(classnames, styleObj) {
         .visit_mut_with(&mut jsx_mut_visitor);
     }
     {
-      let mut insert_mut_visitor =
-        ModuleMutVisitor::new(self.all_style.clone(), insert_module.clone());
+      let mut insert_mut_visitor = ModuleMutVisitor::new(self.all_style.clone());
       self
         .module
         .borrow_mut()

src/style_write.rs

@@ -13,10 +13,11 @@ use lightningcss::{
 };
 use swc_common::{Span, DUMMY_SP};
 use swc_ecma_ast::{
-  BindingIdent, CallExpr, Callee, Decl, Expr, ExprOrSpread, Ident, ImportDecl, ImportSpecifier,
-  JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue, JSXElement, JSXElementName, JSXExpr,
-  JSXExprContainer, JSXFragment, KeyValueProp, Lit, Module, ModuleDecl, ModuleItem, Null,
-  ObjectLit, Pat, Prop, PropName, PropOrSpread, Stmt, Str, VarDecl, VarDeclKind, VarDeclarator,
+  BindingIdent, CallExpr, Callee, Decl, Expr, ExprOrSpread, Ident, ImportDecl,
+  ImportNamedSpecifier, ImportSpecifier, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue,
+  JSXElement, JSXElementName, JSXExpr, JSXExprContainer, JSXFragment, KeyValueProp, Lit, Module,
+  ModuleDecl, ModuleExportName, ModuleItem, Null, ObjectLit, Pat, Prop, PropName, PropOrSpread,
+  Stmt, Str, VarDecl, VarDeclKind, VarDeclarator,
 };
 use swc_ecma_visit::{
   noop_visit_mut_type, noop_visit_type, Visit, VisitAll, VisitAllWith, VisitMut, VisitMutWith,
@@ -177,19 +178,12 @@ impl<'a> VisitAll for AstVisitor<'a> {
 }
 
 pub struct ModuleMutVisitor<'a> {
-  pub insert_module: Rc<RefCell<Module>>,
   pub all_style: Rc<RefCell<HashMap<String, StyleDeclaration<'a>>>>,
 }
 
 impl<'a> ModuleMutVisitor<'a> {
-  pub fn new(
-    all_style: Rc<RefCell<HashMap<String, StyleDeclaration<'a>>>>,
-    insert_module: Rc<RefCell<Module>>,
-  ) -> Self {
-    ModuleMutVisitor {
-      all_style,
-      insert_module,
-    }
+  pub fn new(all_style: Rc<RefCell<HashMap<String, StyleDeclaration<'a>>>>) -> Self {
+    ModuleMutVisitor { all_style }
   }
 }
 
@@ -271,15 +265,29 @@ impl<'a> VisitMut for ModuleMutVisitor<'a> {
     if last_import_index != 0 {
       last_import_index += 1;
     }
+    // 插入代码 import { calcDynamicStyle } from '@tarojs/runtime'
+    module.body.insert(
+      last_import_index,
+      ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
+        span: DUMMY_SP,
+        specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
+          span: DUMMY_SP,
+          local: Ident::new("calcDynamicStyle".into(), DUMMY_SP),
+          imported: Some(ModuleExportName::Ident(Ident::new(
+            "calcDynamicStyle".into(),
+            DUMMY_SP,
+          ))),
+          is_type_only: false,
+        })],
+        src: Box::new(Str::from("@tarojs/runtime")),
+        type_only: false,
+        with: None,
+      })),
+    );
+    last_import_index += 1;
     module
       .body
       .insert(last_import_index, ModuleItem::Stmt(inner_style_stmt));
-    for item in self.insert_module.borrow().body.iter() {
-      if last_import_index != 0 {
-        last_import_index += 1;
-      }
-      module.body.insert(last_import_index, item.clone());
-    }
   }
 }
 
@@ -586,10 +594,15 @@ impl<'a> VisitMut for JSXMutVisitor<'a> {
         let fun_call_expr = Expr::Call(CallExpr {
           span: DUMMY_SP,
           callee: Callee::Expr(Box::new(Expr::Ident(Ident::new(
-            "__calc_style__".into(),
+            "calcDynamicStyle".into(),
             DUMMY_SP,
           )))),
           args: vec![
+            ExprOrSpread::from(Box::new(Expr::Ident(Ident {
+              span: DUMMY_SP,
+              sym: "__inner_style__".into(),
+              optional: false,
+            }))),
             match class_attr_value {
               Some(value) => ExprOrSpread::from(Box::new(value)),
               None => ExprOrSpread::from(Box::new(Expr::Lit(Lit::Null(Null { span: DUMMY_SP })))),