🚧 accept dependencies

Author: Mortaro

README.md

@@ -1,7 +1,6 @@
 ## TODO
 
 - keep babel loader
-- are folders cleaning up?
 - distribute package
 
 ## ROADMAP

dist/swc-plugin-nullstack.wasm

@@ -1,15 +1,17 @@
 use swc_common::DUMMY_SP;
 use swc_core::ecma::{
     ast::*,
+    atoms::JsWord,
     visit::{noop_visit_mut_type, VisitMut, VisitMutWith},
 };
 
 #[derive(Default)]
 pub struct InjectAcceptVisitor {
     class_names: Vec<Ident>,
+    import_paths: Vec<JsWord>,
 }
 
-fn runtime_accept(class_names: &[Ident]) -> ModuleItem {
+fn runtime_accept(class_names: &Vec<Ident>, import_paths: &Vec<JsWord>) -> ModuleItem {
     ModuleItem::Stmt(Stmt::Expr(ExprStmt {
         span: DUMMY_SP,
         expr: Box::new(Expr::Call(CallExpr {
@@ -27,13 +29,66 @@ fn runtime_accept(class_names: &[Ident]) -> ModuleItem {
                     optional: false,
                 }),
             }))),
-            args: class_names
-                .iter()
-                .map(|class_name| ExprOrSpread {
+            args: vec![
+                ExprOrSpread {
                     spread: None,
-                    expr: Box::new(Expr::Ident(class_name.clone())),
-                })
-                .collect(),
+                    expr: Box::new(Expr::Ident(Ident {
+                        span: DUMMY_SP,
+                        sym: "module".into(),
+                        optional: false,
+                    })),
+                },
+                ExprOrSpread {
+                    spread: None,
+                    expr: Box::new(Expr::Object(ObjectLit {
+                        span: DUMMY_SP,
+                        props: vec![
+                            PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
+                                key: PropName::Ident(Ident {
+                                    span: DUMMY_SP,
+                                    sym: "klasses".into(),
+                                    optional: false,
+                                }),
+                                value: Box::new(Expr::Array(ArrayLit {
+                                    span: DUMMY_SP,
+                                    elems: class_names
+                                        .iter()
+                                        .map(|class_name| {
+                                            Some(ExprOrSpread {
+                                                spread: None,
+                                                expr: Box::new(Expr::Ident(class_name.clone())),
+                                            })
+                                        })
+                                        .collect(),
+                                })),
+                            }))),
+                            PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
+                                key: PropName::Ident(Ident {
+                                    span: DUMMY_SP,
+                                    sym: "dependencies".into(),
+                                    optional: false,
+                                }),
+                                value: Box::new(Expr::Array(ArrayLit {
+                                    span: DUMMY_SP,
+                                    elems: import_paths
+                                        .iter()
+                                        .map(|import_path| {
+                                            Some(ExprOrSpread {
+                                                spread: None,
+                                                expr: Box::new(Expr::Lit(Lit::Str(Str {
+                                                    span: DUMMY_SP,
+                                                    value: import_path.clone(),
+                                                    raw: None,
+                                                }))),
+                                            })
+                                        })
+                                        .collect(),
+                                })),
+                            }))),
+                        ],
+                    })),
+                },
+            ],
             type_args: None,
         })),
     }))
@@ -43,13 +98,13 @@ impl VisitMut for InjectAcceptVisitor {
     noop_visit_mut_type!();
 
     fn visit_mut_module(&mut self, n: &mut Module) {
-        self.class_names.push(Ident {
-            span: DUMMY_SP,
-            sym: "module".into(),
-            optional: false,
-        });
         n.visit_mut_children_with(self);
-        n.body.push(runtime_accept(&self.class_names));
+        n.body
+            .push(runtime_accept(&self.class_names, &self.import_paths));
+    }
+
+    fn visit_mut_import_decl(&mut self, n: &mut ImportDecl) {
+        self.import_paths.push(n.src.value.clone());
     }
 
     fn visit_mut_class_decl(&mut self, n: &mut ClassDecl) {

src/loaders/inject_accept_to_module.rs

@@ -8,14 +8,44 @@ test!(
     syntax(),
     |_| tr(InjectAcceptVisitor::default()),
     inject_accept,
-    r#"class Component {};"#,
-    r#"class Component {}; $runtime.accept(module, Component)"#
+    r#"
+        class Component {};
+    "#,
+    r#"
+        class Component {};
+        $runtime.accept(module, {klasses: [Component], dependencies: []})
+    "#
 );
 
 test!(
     syntax(),
     |_| tr(InjectAcceptVisitor::default()),
     inject_multiple_accept,
-    r#"class Component {}; class Component2 {};"#,
-    r#"class Component {}; class Component2 {}; $runtime.accept(module, Component, Component2)"#
+    r#"
+        class Component {}; 
+        class Component2 {};
+    "#,
+    r#"
+        class Component {}; 
+        class Component2 {}; 
+        $runtime.accept(module, {klasses: [Component, Component2], dependencies: []})
+    "#
+);
+
+test!(
+    syntax(),
+    |_| tr(InjectAcceptVisitor::default()),
+    inject_multiple_imports,
+    r#"
+        import Nullstack from 'nullstack'; 
+        import Logo from 'nullstack/logo'; 
+        class Component {}; 
+        class Component2 {};
+    "#,
+    r#"
+        import Nullstack from 'nullstack'; 
+        import Logo from 'nullstack/logo'; 
+        class Component {}; 
+        class Component2 {}; 
+        $runtime.accept(module, {klasses: [Component, Component2], dependencies: ["nullstack", "nullstack/logo"]})"#
 );