@tarojs/helper 3.6.9-alpha.8 → 3.6.10-alpha.1

package/swc/plugin-define-config/Cargo.toml

@@ -1,19 +1,27 @@
 [package]
 name = "swc-plugin-define-config"
-version = "0.2.0"
+version = "0.1.0"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [profile.release]
+# This removes more dead code
+codegen-units = 1
 lto = true
+# Optimize for size
+opt-level = "s"
+# Optimize for performance, this is default so you don't need to specify it
+# opt-level = "z"
+# Strip debug symbols
+strip = "symbols"
 
 [dependencies]
 serde = "1"
-swc_core = { version = "0.79.*", features = ["ecma_plugin_transform"] }
-swc_ecma_utils = "0.120.1"
+swc_core = { version = "0.40.*", features = ["plugin_transform"] }
 
 # .cargo/config defines few alias to build plugin.
 # cargo build-wasi generates wasm-wasi32 binary
 # cargo build-wasm32 generates wasm32-unknown-unknown binary.
+

package/swc/plugin-define-config/src/lib.rs

@@ -1,75 +1,102 @@
-use swc_core::{
-  ecma::{
-      ast::*,
-      transforms::testing::test,
-      visit::{as_folder, FoldWith, VisitMut, VisitMutWith},
-  },
-  common::{
-      DUMMY_SP,
-      SyntaxContext
-  },
+use swc_core::ecma::{
+    ast::*,
+    transforms::testing::test,
+    visit::{as_folder, FoldWith, VisitMut, VisitMutWith},
 };
-use swc_ecma_utils::{quote_ident, FunctionFactory};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::plugin::{plugin_transform, proxies::TransformPluginProgramMetadata};
 
-pub struct TransformVisitor;
+struct DefineConfig {
+    found: bool,
+    fn_name: String,
+    ctxt: SyntaxContext
+}
 
-struct DefineFoler {
-  name: Option<String>,
-  ctxt: Option<SyntaxContext>,
+impl DefineConfig {
+    fn new() -> Self {
+        Self {
+            found: false,
+            fn_name: String::from(""),
+            ctxt: SyntaxContext::empty()
+        }
+    }
 }
 
-impl VisitMut for DefineFoler {
-  fn visit_mut_call_expr(&mut self, expr: &mut CallExpr) {
-      expr.visit_mut_children_with(self);
-      if let Callee::Expr(expr) = &expr.callee {
-          if let Expr::Ident(ident) = &**expr {
-              if &*ident.sym == "defineAppConfig" || &*ident.sym == "definePageConfig" {
-                  self.name = Some(String::from(&*ident.sym));
-                  self.ctxt = Some(ident.span.ctxt);
-              }
-          }
+impl VisitMut for DefineConfig {
+  fn visit_mut_call_expr(&mut self, node: &mut CallExpr) {
+    node.visit_mut_children_with(self);
+
+    let callee = &node.callee;
+    if let Some(expr_box) = callee.as_expr() {
+      if let Expr::Ident(ident) = &**expr_box {
+        if &ident.sym == "defineAppConfig" || &ident.sym == "definePageConfig" {
+          self.found = true;
+          self.fn_name = String::from(&*ident.sym);
+          self.ctxt = ident.span.ctxt;
+        }
       }
+    }
   }
 }
 
+pub struct TransformVisitor;
+
 impl VisitMut for TransformVisitor {
-  fn visit_mut_module_items(&mut self, items: &mut Vec<ModuleItem>) {
-      let mut folder = DefineFoler { name: None, ctxt: None };
+    fn visit_mut_module_items(&mut self, module_item: &mut Vec<ModuleItem>) {
+      module_item.visit_mut_children_with(self);
+
+      let mut define_config = DefineConfig::new();
       let mut line_to_be_insert: usize = 0;
 
-      for (index, item) in items.iter_mut().enumerate() {
-          item.visit_mut_with(&mut folder);
-          if folder.name.is_some() {
-              line_to_be_insert = index;
-              break
+      for (idx, item) in module_item.iter_mut().enumerate() {
+        match item {
+          ModuleItem::Stmt(stmt) => {
+            stmt.visit_mut_with(&mut define_config);
+            if define_config.found {
+              line_to_be_insert = idx;
+              break;
+            }
           }
+          ModuleItem::ModuleDecl(ModuleDecl::ExportDefaultExpr(expr)) => {
+            expr.visit_mut_with(&mut define_config);
+            if define_config.found {
+              line_to_be_insert = idx;
+              break;
+            }
+          }
+          _ => ()
+        }
       }
-      if let Some(name) = &folder.name {
-          let func_name = quote_ident!(DUMMY_SP.with_ctxt(folder.ctxt.unwrap()), name.as_str());
-          let func = Function {
+
+      if define_config.found {
+        let func = Stmt::Decl(Decl::Fn(FnDecl {
+          ident: Ident::new(define_config.fn_name.into(), DUMMY_SP.with_ctxt(define_config.ctxt)),
+          declare: false,
+          function: Box::new(Function {
+            span: DUMMY_SP,
+            params: vec![Param {
               span: DUMMY_SP,
               decorators: Default::default(),
-              params: vec![Param {
-                  span: DUMMY_SP,
-                  decorators: Default::default(),
-                  pat: Pat::Ident(quote_ident!("config").into()),
-              }],
-              body: Some(BlockStmt {
-                  span: DUMMY_SP,
-                  stmts: vec![Stmt::Return(ReturnStmt {
-                    span: DUMMY_SP,
-                    arg: Some(Box::new(quote_ident!("config").into())),
-                  })],
-                }),
-              is_async: false,
-              is_generator: false,
-              type_params: None,
-              return_type: None,
-          };
-          items.insert(line_to_be_insert, ModuleItem::Stmt(Stmt::Decl(Decl::Fn(func.into_fn_decl(func_name)))));
+              pat: Pat::Ident(BindingIdent::from(Ident::new("config".into(), DUMMY_SP))),
+            }],
+            body: Some(BlockStmt {
+              span: DUMMY_SP,
+              stmts: vec![Stmt::Return(ReturnStmt {
+                span: DUMMY_SP,
+                arg: Some(Box::new(Expr::Ident(Ident::new("config".into(), DUMMY_SP)))),
+              })],
+            }),
+            is_generator: false,
+            is_async: false,
+            type_params: Default::default(),
+            decorators: Default::default(),
+            return_type: Default::default(),
+          }),
+        }));
+
+        module_item.insert(line_to_be_insert, ModuleItem::Stmt(func));
       }
-  }
+    }
 }
 
 /// An example plugin function with macro support.
@@ -89,7 +116,7 @@ impl VisitMut for TransformVisitor {
 /// Refer swc_plugin_macro to see how does it work internally.
 #[plugin_transform]
 pub fn process_transform(program: Program, _metadata: TransformPluginProgramMetadata) -> Program {
-  program.fold_with(&mut as_folder(TransformVisitor))
+    program.fold_with(&mut as_folder(TransformVisitor))
 }
 
 // An example to test plugin transform.
@@ -97,98 +124,65 @@ pub fn process_transform(program: Program, _metadata: TransformPluginProgramMeta
 // the Visitor's behavior, instead of trying to run `process_transform` with mocks
 // unless explicitly required to do so.
 test!(
-  Default::default(),
-  |_| as_folder(TransformVisitor),
-  module_decl_default_app,
-  // Input codes
-  r#"
-  export default defineAppConfig({})
-  "#,
-  // Output codes after transformed with plugin
-  r#"
-  function defineAppConfig(config) {return config}
-  export default defineAppConfig({})
-  "#
+    Default::default(),
+    |_| as_folder(TransformVisitor),
+    module_decl_default_app,
+    // Input codes
+    r#"
+    export default defineAppConfig({})
+    "#,
+    // Output codes after transformed with plugin
+    r#"
+    function defineAppConfig(config) {return config}
+    export default defineAppConfig({})
+    "#
+);
+
+test!(
+    Default::default(),
+    |_| as_folder(TransformVisitor),
+    module_decl_default_page,
+    // Input codes
+    r#"
+    export default definePageConfig({})
+    "#,
+    // Output codes after transformed with plugin
+    r#"
+    function definePageConfig(config) {return config}
+    export default definePageConfig({})
+    "#
 );
 
 test!(
   Default::default(),
   |_| as_folder(TransformVisitor),
-  module_decl_default_page,
+  var_decl_app,
   // Input codes
   r#"
-  export default definePageConfig({})
+  const config = defineAppConfig({})
+  export default config
   "#,
   // Output codes after transformed with plugin
   r#"
-  function definePageConfig(config) {return config}
-  export default definePageConfig({})
+  function defineAppConfig(config) {return config}
+  const config = defineAppConfig({})
+  export default config
   "#
 );
 
-test!(
-Default::default(),
-|_| as_folder(TransformVisitor),
-var_decl_app,
-// Input codes
-r#"
-const config = defineAppConfig({})
-export default config
-"#,
-// Output codes after transformed with plugin
-r#"
-function defineAppConfig(config) {return config}
-const config = defineAppConfig({})
-export default config
-"#
-);
-
-test!(
-Default::default(),
-|_| as_folder(TransformVisitor),
-var_decl_page,
-// Input codes
-r#"
-const config = definePageConfig({})
-export default config
-"#,
-// Output codes after transformed with plugin
-r#"
-function definePageConfig(config) {return config}
-const config = definePageConfig({})
-export default config
-"#
-);
-
 test!(
   Default::default(),
   |_| as_folder(TransformVisitor),
-  module_exports,
+  var_decl_page,
   // Input codes
   r#"
-  var require_index_config = __commonJS({
-      "src/pages/index/index.config.ts": function(exports1, module) {
-          var config = definePageConfig({
-              navigationBarTitleText: "首页",
-              usingComponents: {}
-          });
-          module.exports = config;
-      }
-  });
-  var _default = require_index_config();
+  const config = definePageConfig({})
+  export default config
   "#,
   // Output codes after transformed with plugin
   r#"
   function definePageConfig(config) {return config}
-  var require_index_config = __commonJS({
-      "src/pages/index/index.config.ts": function(exports1, module) {
-          var config = definePageConfig({
-              navigationBarTitleText: "首页",
-              usingComponents: {}
-          });
-          module.exports = config;
-      }
-  });
-  var _default = require_index_config();
+  const config = definePageConfig({})
+  export default config
   "#
 );