Support default export expression for variables

packages/next-swc/crates/core/src/server_actions.rs

@@ -75,17 +75,24 @@ struct ServerActions<C: Comments> {
     closure_idents: Vec<Id>,
     action_idents: Vec<Name>,
     async_fn_idents: Vec<Id>,
-    exported_idents: Vec<Id>,
+
+    // (ident, is default export)
+    exported_idents: Vec<(Id, bool)>,
 
     annotations: Vec<Stmt>,
     extra_items: Vec<ModuleItem>,
     export_actions: Vec<String>,
 }
 
 impl<C: Comments> ServerActions<C> {
-    fn get_action_info(&mut self, ident: &mut Ident, function: &mut Box<Function>) -> (bool, bool) {
+    fn get_action_info(
+        &mut self,
+        ident: &mut Ident,
+        function: &mut Box<Function>,
+    ) -> (bool, bool, bool) {
         let mut is_action_fn = false;
-        let mut is_exported = false;
+        let mut is_exported = self.in_export_decl;
+        let mut is_default_export = self.in_default_export_decl;
 
         if self.in_action_file && self.in_export_decl {
             // All export functions in a server file are actions
@@ -101,20 +108,26 @@ impl<C: Comments> ServerActions<C> {
             }
 
             // If it's exported via named export, it's a valid action.
-            if !is_action_fn && self.exported_idents.contains(&ident.to_id()) {
+            let exported_ident = self
+                .exported_idents
+                .iter()
+                .find(|(id, _)| id == &ident.to_id());
+            if let Some((_, is_default)) = exported_ident {
                 is_action_fn = true;
                 is_exported = true;
+                is_default_export = *is_default;
             }
         }
 
-        (is_action_fn, is_exported)
+        (is_action_fn, is_exported, is_default_export)
     }
 
     fn add_action_annotations(
         &mut self,
         ident: &mut Ident,
         function: &mut Box<Function>,
         is_exported: bool,
+        is_default_export: bool,
     ) -> Option<Box<Function>> {
         if !function.is_async {
             HANDLER.with(|handler| {
@@ -132,7 +145,7 @@ impl<C: Comments> ServerActions<C> {
         };
         let action_ident = private_ident!(action_name.clone());
 
-        let export_name: JsWord = if self.in_default_export_decl {
+        let export_name: JsWord = if is_default_export {
             "default".into()
         } else {
             action_name
@@ -312,7 +325,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
             }
         }
 
-        let (is_action_fn, is_exported) =
+        let (is_action_fn, is_exported, is_default_export) =
             self.get_action_info(f.ident.as_mut().unwrap(), &mut f.function);
 
         {
@@ -333,8 +346,12 @@ impl<C: Comments> VisitMut for ServerActions<C> {
             return;
         }
 
-        let maybe_new_fn =
-            self.add_action_annotations(f.ident.as_mut().unwrap(), &mut f.function, is_exported);
+        let maybe_new_fn = self.add_action_annotations(
+            f.ident.as_mut().unwrap(),
+            &mut f.function,
+            is_exported,
+            is_default_export,
+        );
 
         if let Some(new_fn) = maybe_new_fn {
             f.function = new_fn;
@@ -351,7 +368,8 @@ impl<C: Comments> VisitMut for ServerActions<C> {
             return;
         }
 
-        let (is_action_fn, is_exported) = self.get_action_info(&mut f.ident, &mut f.function);
+        let (is_action_fn, is_exported, is_default_export) =
+            self.get_action_info(&mut f.ident, &mut f.function);
 
         {
             // Visit children
@@ -371,7 +389,12 @@ impl<C: Comments> VisitMut for ServerActions<C> {
             return;
         }
 
-        let maybe_new_fn = self.add_action_annotations(&mut f.ident, &mut f.function, is_exported);
+        let maybe_new_fn = self.add_action_annotations(
+            &mut f.ident,
+            &mut f.function,
+            is_exported,
+            is_default_export,
+        );
 
         if let Some(new_fn) = maybe_new_fn {
             f.function = new_fn;
@@ -465,7 +488,11 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                         ..
                     })) => {
                         let ids: Vec<Id> = collect_idents_in_var_decls(&var.decls);
-                        self.exported_idents.extend(ids);
+                        self.exported_idents.extend(
+                            ids.into_iter()
+                                .map(|id| (id, false))
+                                .collect::<Vec<(Id, bool)>>(),
+                        );
                     }
                     ModuleItem::ModuleDecl(ModuleDecl::ExportNamed(named)) => {
                         for spec in &named.specifiers {
@@ -475,10 +502,19 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                             }) = spec
                             {
                                 // export { foo, foo as bar }
-                                self.exported_idents.push(ident.to_id());
+                                self.exported_idents.push((ident.to_id(), false));
                             }
                         }
                     }
+                    ModuleItem::ModuleDecl(ModuleDecl::ExportDefaultExpr(ExportDefaultExpr {
+                        expr,
+                        ..
+                    })) => {
+                        if let Expr::Ident(ident) = &**expr {
+                            // export default foo
+                            self.exported_idents.push((ident.to_id(), true));
+                        }
+                    }
                     _ => {}
                 }
 
@@ -552,6 +588,11 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                         ..
                     })) => match &**expr {
                         Expr::Fn(_f) => {}
+                        Expr::Ident(ident) => {
+                            if !self.async_fn_idents.contains(&ident.to_id()) {
+                                disallowed_export_span = *span;
+                            }
+                        }
                         _ => {
                             disallowed_export_span = *span;
                         }

packages/next-swc/crates/core/tests/fixture/server-actions/12/input.js

@@ -0,0 +1,3 @@
+'use server'
+async function foo () {}
+export default foo

packages/next-swc/crates/core/tests/fixture/server-actions/12/output.js

@@ -0,0 +1,6 @@
+/* __next_internal_action_entry_do_not_use__ default */ async function foo() {}
+foo.$$typeof = Symbol.for("react.server.reference");
+foo.$$filepath = "/app/item.js";
+foo.$$name = "default";
+foo.$$bound = [];
+export default foo;