Merge branch 'main' into main

Author: yinone

.github/workflows/nodejs.yml

@@ -28,7 +28,7 @@ jobs:
     name: Build Rust WASM
     uses: ./.github/workflows/build-rust-wasm.yml
 
-  nodejs-tesing:
+  nodejs-testing:
     name: Testing on Node.js ${{ matrix.node-version }} (${{ matrix.host }})
     needs:
       - build-rust-binding
@@ -118,31 +118,27 @@ jobs:
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
-          move_coverage_to_trash: true
           flags: taro-cli
           files: ./packages/taro-cli/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload runner coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
-          move_coverage_to_trash: true
           flags: taro-runner
           files: ./packages/taro-webpack5-runner/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload [taro-runtime] coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
-          move_coverage_to_trash: true
           flags: taro-runtime
           files: ./packages/taro-runtime/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload [taro-web] coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
-          move_coverage_to_trash: true
           flags: taro-web
           files: ./packages/taro-components/coverage/clover.xml,./packages/taro-h5/coverage/clover.xml,./packages/taro-router/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}

.npmrc

@@ -9,7 +9,6 @@ public-hoist-pattern[]=@types/*
 public-hoist-pattern[]=*eslint*
 public-hoist-pattern[]=*jest*
 public-hoist-pattern[]=*prettier*
-registry="https://registry.yarnpkg.com/"
 strict-peer-dependencies=false
 
 {SCOPE}:registry=https://npm.pkg.github.com

crates/native_binding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "4.0.10-beta.1",
+  "version": "4.0.10-alpha.5",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

crates/swc_plugin_compile_mode/src/tests/mod.rs

@@ -3,6 +3,7 @@ use swc_core::ecma::{
   parser,
   visit::{as_folder, Fold},
 };
+use std::env;
 
 mod attributes;
 mod children;
@@ -12,6 +13,7 @@ mod harmony;
 mod looping;
 mod shake;
 mod wxs;
+mod skyline;
 
 pub fn tr() -> impl Fold {
   let config = serde_json::from_str::<PluginConfig>(
@@ -92,6 +94,10 @@ pub fn tr() -> impl Fold {
 }
 
 pub fn get_syntax_config() -> parser::Syntax {
+  // 获取当前工作目录
+  let manifest_dir = env::current_dir().expect("Failed to get current directory");
+  // 设置 CARGO_MANIFEST_DIR 环境变量
+  env::set_var("CARGO_MANIFEST_DIR", manifest_dir.to_str().unwrap());
   parser::Syntax::Es(parser::EsConfig {
     jsx: true,
     ..Default::default()

crates/swc_plugin_compile_mode/src/tests/skyline.rs

@@ -0,0 +1,40 @@
+use super::{get_syntax_config, tr};
+use swc_core::ecma::transforms::testing::test;
+
+test!(
+  get_syntax_config(),
+  |_| tr(),
+  should_support_list,
+  r#"
+    import { List as TaroList, ListItem as TaroListItem } from '@tarojs/components'
+    const list = [1,2,3]
+    function Index () {
+        return (
+          <TaroList 
+            compileMode
+            scrollY
+            onScroll={() => {
+                console.log("scroll");
+            }}
+            onItemDispose={(ev) => {
+                console.log(`${ev.detail.index} disposed`);
+            }}
+            list={list}
+            childCount={list.length}
+            childHeight={100}
+            style={{ height: "100vh" }}
+            type="static"
+          >
+            {
+                list.map(x => (
+                        <TaroListItem key={x} style={{height: 100}}>
+                            <View>{x}</View>
+                        </TaroListItem>
+                    )
+                )
+            }
+          </TaroList>
+        )
+    }
+    "#
+);

crates/swc_plugin_compile_mode/src/transform.rs

@@ -1,6 +1,7 @@
-use crate::utils::{self, constants::*};
+use crate::utils::{self, constants::*, transform_taro_components};
 use crate::{utils::as_xscript_expr_string, PluginConfig};
 use std::collections::HashMap;
+use std::vec;
 use swc_core::{
   atoms::Atom,
   common::{iter::IdentifyLast, util::take::Take, Spanned, DUMMY_SP as span},
@@ -13,10 +14,23 @@ use swc_core::{
   plugin::errors::HANDLER,
 };
 
-struct PreVisitor;
+struct PreVisitor {
+  // HashMap<导出名, 模块标识符>
+  pub import_specifiers: HashMap<String, String>,
+  // HashMap<导出名, 别名>
+  // import { x as y } from 'pkg'; import_aliases: [[x -> y]]
+  pub import_aliases: HashMap<String, String>,
+}
+
 impl PreVisitor {
-  fn new() -> Self {
-    Self {}
+  fn new(
+    import_specifiers: HashMap<String, String>,
+    import_aliases: HashMap<String, String>,
+  ) -> Self {
+    Self {
+      import_specifiers,
+      import_aliases,
+    }
   }
 }
 impl VisitMut for PreVisitor {
@@ -232,6 +246,12 @@ impl VisitMut for PreVisitor {
       child.visit_mut_children_with(self);
     }
   }
+
+  fn visit_mut_jsx_element(&mut self, el: &mut JSXElement) {
+    // 处理 @tarojs/components 的 List,ListItem 组件
+    transform_taro_components(el, &self.import_specifiers, &self.import_aliases);
+    el.visit_mut_children_with(self);
+  }
 }
 
 pub struct TransformVisitor {
@@ -242,6 +262,11 @@ pub struct TransformVisitor {
   pub get_tmpl_name: Box<dyn FnMut() -> String>,
   pub xs_module_names: Vec<String>,
   pub xs_sources: Vec<String>,
+  // HashMap<导出名, 模块标识符>
+  pub import_specifiers: HashMap<String, String>,
+  // HashMap<导出名, 别名>
+  // import { x as y } from 'pkg'; import_aliases: [[x -> y]]
+  pub import_aliases: HashMap<String, String>,
 }
 
 impl TransformVisitor {
@@ -255,15 +280,72 @@ impl TransformVisitor {
       get_tmpl_name,
       xs_module_names: vec![],
       xs_sources: vec![],
+      import_specifiers: HashMap::new(),
+      import_aliases: HashMap::new(),
     }
   }
 
+  fn collect_import_info(&mut self, body_stmts: &mut Vec<ModuleItem>) {
+    body_stmts.iter().for_each(|item| match item {
+      ModuleItem::ModuleDecl(ModuleDecl::Import(import_decl)) => {
+        import_decl.specifiers.iter().for_each(|import_specifier| {
+          let src = import_decl.src.value.to_string();
+          match import_specifier {
+            ImportSpecifier::Named(import_named_specifier) => {
+              let specifier = import_named_specifier.local.sym.to_string();
+              // origin: 原始导出名
+              // import { X as Y } from 'pkg', origin = X;
+              // import { X } from 'pkg', origin = X;
+              let mut origin = specifier.clone();
+              self.import_specifiers.insert(specifier.clone(), src);
+
+              if let Some(ModuleExportName::Ident(imported)) =
+                import_named_specifier.clone().imported
+              {
+                origin = imported.sym.to_string();
+              }
+              self
+                .import_aliases
+                .insert(origin.clone(), specifier.clone());
+            }
+            ImportSpecifier::Default(import_default_specifier) => {
+              let specifier = import_default_specifier.local.sym.to_string();
+              self.import_specifiers.insert(specifier, src);
+            }
+            ImportSpecifier::Namespace(import_star_as_specifier) => {
+              let specifier = import_star_as_specifier.local.sym.to_string();
+              self.import_specifiers.insert(specifier, src);
+            }
+          }
+        });
+      }
+      _ => (),
+    });
+  }
+
   fn build_xml_element(&mut self, el: &mut JSXElement) -> String {
     let is_inner_component = utils::is_inner_component(&el, &self.config);
     let opening_element = &mut el.opening;
 
+    let has_slot_item_attr = opening_element.clone().attrs.iter().any(|attr| {
+      if let JSXAttrOrSpread::JSXAttr(attr) = attr {
+        if let JSXAttrName::Ident(Ident { sym: name, .. }) = &attr.name {
+          return name.to_string() == SLOT_ITEM;
+        }
+      }
+      false
+    });
     match &opening_element.name {
       JSXElementName::Ident(ident) => {
+        // 先特殊处理有 slotItem 属性的组件，避免进入回退逻辑添加 wx:for 造成干扰
+        if has_slot_item_attr {
+          let node_path = self.get_current_node_path();
+          return format!(
+            "<block slot:item slot:index>{}</block>",
+            self.generate_template(node_path, "".to_string())
+          );
+        }
+
         if is_inner_component {
           // 内置组件
           let mut name = utils::to_kebab_case(ident.as_ref());
@@ -295,8 +377,23 @@ impl TransformVisitor {
           )
         } else {
           // 回退到旧的渲染模式（React 组件、原生自定义组件）
+          // 如果是 map React组件，那么组件经过 extract_jsx_loop 的处理后会有 compileFor 属性，可以检测这个属性判断当前组件是否是循环里的组件
+          let is_loop = el.opening.attrs.iter().any(|attr| {
+            if let JSXAttrOrSpread::JSXAttr(attr) = attr {
+              if let JSXAttrName::Ident(attr) = &attr.name {
+                return attr.sym == COMPILE_FOR;
+              }
+            }
+            false
+          });
           let node_path = self.get_current_node_path();
-          self.generate_template(node_path)
+          // 循环的组件需要添加 wx:for 指令，否则生成的 template 里的 item 找不到
+          let attrs = if is_loop {
+            "wx:for=\"{{i.cn}}\" wx:key=\"{{sid}}\""
+          } else {
+            ""
+          };
+          self.generate_template(node_path, attrs.to_string())
         }
       }
       JSXElementName::JSXMemberExpr(JSXMemberExpr { prop, .. }) => {
@@ -307,7 +404,7 @@ impl TransformVisitor {
         } else {
           // 回退到旧的渲染模式
           let node_path = self.get_current_node_path();
-          self.generate_template(node_path)
+          self.generate_template(node_path, "".to_string())
         }
       }
       _ => String::new(),
@@ -325,7 +422,6 @@ impl TransformVisitor {
     let is_xscript = utils::is_xscript(element_name);
     let mut attrs_wait_for_inserting: Vec<JSXAttrOrSpread> = vec![];
     let mut get_xs_attrs_name = utils::named_iter("xs".into());
-
     opening_element.attrs.retain_mut(|attr| {
       if let JSXAttrOrSpread::JSXAttr(jsx_attr) = attr {
         if let JSXAttrName::Ident(Ident { sym: name, .. }) = &jsx_attr.name {
@@ -471,7 +567,16 @@ impl TransformVisitor {
                   // 小程序组件标准属性 -> 取 @tarojs/shared 传递过来的属性值；非标准属性 -> 取属性名
                   let value: &str = attrs_map
                     .get(&miniapp_attr_name)
-                    .map(|res| res.as_str())
+                    .map(|res| {
+                      // list-builder这种场景下需要把原 list 换成 taro vdom 的 list
+                      if utils::to_kebab_case(element_name) == "list-builder"
+                        && miniapp_attr_name == "list"
+                      {
+                        "cn"
+                      } else {
+                        res.as_str()
+                      }
+                    })
                     .unwrap_or(if miniapp_attr_name == "id" {
                       "uid"
                     } else {
@@ -496,6 +601,7 @@ impl TransformVisitor {
               if jsx_attr_name == COMPILE_ELSE || jsx_attr_name == COMPILE_IGNORE {
                 props.insert(miniapp_attr_name, String::from(jsx_attr_name));
               } else if jsx_attr_name == COMPILE_FOR {
+                // 构造 wx:for 表达式
                 let current_path = self.get_current_loop_path();
                 let miniapp_attr_value = format!("{{{{{}}}}}", current_path);
                 props.insert(miniapp_attr_name, miniapp_attr_value);
@@ -643,7 +749,7 @@ impl TransformVisitor {
                 let child_string = self.build_xml_element(&mut *return_value);
                 children_string.push_str(&child_string);
               } else if utils::is_render_fn(callee_expr) {
-                let tmpl = self.generate_template(node_path);
+                let tmpl = self.generate_template(node_path, "".to_string());
                 children_string.push_str(&tmpl)
               } else {
                 let mut xscript_expr_string: Option<String> = None;
@@ -786,19 +892,20 @@ impl TransformVisitor {
     (children_string, retain_child_counter - start)
   }
 
-  fn generate_template(&mut self, node_path: String) -> String {
+  fn generate_template(&mut self, node_path: String, attrs: String) -> String {
     if self.config.is_use_xs {
       format!(
-        r#"<template is="{{{{xs.a(c, {}.nn, l)}}}}" data="{{{{i:{},c:c+1,l:xs.f(l,{}.nn)}}}}" />"#,
-        node_path, node_path, node_path
+        r#"<template is="{{{{xs.a(c, {}.nn, l)}}}}" data="{{{{i:{},c:c+1,l:xs.f(l,{}.nn)}}}}" {}/>"#,
+        node_path, node_path, node_path, attrs
       )
     } else {
       format!(
-        r#"<template is="{{{{'tmpl_' + ({}.nn[0] === '{}' ? 0 : c) + '_' + {}.nn }}}}" data="{{{{i:{},c:c+1}}}}" />"#,
+        r#"<template is="{{{{'tmpl_' + ({}.nn[0] === '{}' ? 0 : c) + '_' + {}.nn }}}}" data="{{{{i:{},c:c+1}}}}" {}/>"#,
         node_path,
         self.config.tmpl_prefix.chars().next().unwrap(),
         node_path,
-        node_path
+        node_path,
+        attrs
       )
     }
   }
@@ -864,9 +971,14 @@ impl VisitMut for TransformVisitor {
         }
       }
     }
+
     if self.is_compile_mode {
       self.reset_states();
-      el.visit_mut_children_with(&mut PreVisitor::new());
+      transform_taro_components(el, &self.import_specifiers, &self.import_aliases);
+      el.visit_mut_children_with(&mut PreVisitor::new(
+        self.import_specifiers.clone(),
+        self.import_aliases.clone(),
+      ));
 
       let tmpl_contents = format!(
         r#"{}<template name="tmpl_0_{}">{}</template>{}"#,
@@ -883,6 +995,8 @@ impl VisitMut for TransformVisitor {
   }
 
   fn visit_mut_module_items(&mut self, body_stmts: &mut Vec<ModuleItem>) {
+    // 收集模块导入信息
+    self.collect_import_info(body_stmts);
     body_stmts.visit_mut_children_with(self);
 
     let mut keys: Vec<&String> = self.templates.keys().collect();

crates/swc_plugin_compile_mode/src/utils/constants.rs

@@ -4,6 +4,7 @@ pub const COMPILE_ELSE: &str = "compileElse";
 pub const COMPILE_IGNORE: &str = "compileIgnore";
 pub const COMPILE_FOR: &str = "compileFor";
 pub const COMPILE_FOR_KEY: &str = "compileForKey";
+pub const SLOT_ITEM: &str = "slotItem";
 pub const EVENT_HANDLER: &str = "eh";
 pub const DATA_SID: &str = "data-sid";
 pub const TMPL_DATA_ROOT: &str = "i.";