WIP debug

Author: mischnic

crates/next-api/src/module_graph.rs

@@ -238,7 +238,7 @@ pub struct ServerActionsGraph {
 }
 
 #[turbo_tasks::value]
-pub struct ServerActionsGraphs(Vec<ResolvedVc<ServerActionsGraph>>);
+pub struct ServerActionsGraphs(pub Vec<ResolvedVc<ServerActionsGraph>>);
 
 #[turbo_tasks::value_impl]
 impl ServerActionsGraphs {

crates/next-api/src/server_actions.rs

@@ -307,6 +307,7 @@ async fn parse_actions(module: ResolvedVc<Box<dyn Module>>) -> Result<Vc<OptionA
     let fragment = ecmascript_asset.failsafe_parse().resolve().await?;
 
     if fragment != original_parsed {
+        println!("different {:?}", module.ident_string().await?);
         let ParseResult::Ok {
             program: fragment, ..
         } = &*fragment.await?
@@ -461,6 +462,51 @@ pub async fn map_server_actions(graph: Vc<SingleModuleGraph>) -> Result<Vc<AllMo
                 // TODO really ignore SSR?
                 _ => return Ok(None),
             };
+
+            let id = module.ident_string().await?;
+
+            if id.contains("data:") {
+                println!(
+                    "{:?} {:?} {:#?}",
+                    module.ident_string().await?,
+                    if let Some(v) = &*parse_actions(*module).await? {
+                        Some(v.await?)
+                    } else {
+                        None
+                    },
+                    if let Some(ecmascript_asset) =
+                        ResolvedVc::try_sidecast::<Box<dyn EcmascriptParsable>>(module)
+                    {
+                        (
+                            if let ParseResult::Ok {
+                                program, comments, ..
+                            } = &*ecmascript_asset.parse_original().await?
+                            {
+                                swc_core::ecma::codegen::to_code_with_comments(
+                                    Some(&comments.consumable()),
+                                    &program,
+                                )
+                            } else {
+                                panic!();
+                            },
+                            if let ParseResult::Ok {
+                                program, comments, ..
+                            } = &*ecmascript_asset.failsafe_parse().await?
+                            {
+                                swc_core::ecma::codegen::to_code_with_comments(
+                                    Some(&comments.consumable()),
+                                    &program,
+                                )
+                            } else {
+                                panic!();
+                            },
+                        )
+                    } else {
+                        panic!();
+                    }
+                );
+            }
+
             // TODO the old implementation did parse_actions(to_rsc_context(module))
             // is that really necessary?
             Ok(parse_actions(*module)

crates/next-custom-transforms/src/transforms/server_actions.rs

@@ -1,6 +1,6 @@
 use std::{
     cell::RefCell,
-    collections::{hash_map, BTreeMap},
+    collections::{BTreeMap, hash_map},
     convert::{TryFrom, TryInto},
     mem::{replace, take},
     path::{Path, PathBuf},
@@ -16,23 +16,23 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use serde::Deserialize;
 use sha1::{Digest, Sha1};
 use swc_core::{
-    atoms::{atom, Atom},
+    atoms::{Atom, atom},
     common::{
+        BytePos, DUMMY_SP, FileName, Mark, SourceMap, Span, SyntaxContext,
         comments::{Comment, CommentKind, Comments, SingleThreadedComments},
         errors::HANDLER,
-        source_map::{SourceMapGenConfig, PURE_SP},
+        source_map::{PURE_SP, SourceMapGenConfig},
         util::take::Take,
-        BytePos, FileName, Mark, SourceMap, Span, SyntaxContext, DUMMY_SP,
     },
     ecma::{
         ast::*,
-        codegen::{self, text_writer::JsWriter, Emitter},
-        utils::{private_ident, quote_ident, ExprFactory},
-        visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith},
+        codegen::{self, Emitter, text_writer::JsWriter},
+        utils::{ExprFactory, private_ident, quote_ident},
+        visit::{VisitMut, VisitMutWith, noop_visit_mut_type, visit_mut_pass},
     },
     quote,
 };
-use turbo_rcstr::{rcstr, RcStr};
+use turbo_rcstr::{RcStr, rcstr};
 
 use crate::FxIndexMap;
 
@@ -2089,6 +2089,19 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                         .into(),
                     },
                 );
+                stmts.push(ModuleItem::Stmt(Stmt::Expr(ExprStmt {
+                    span: DUMMY_SP,
+                    expr: Box::new(Expr::Lit(Lit::Str(
+                        generate_server_actions_comment(
+                            &actions,
+                            match self.mode {
+                                ServerActionsMode::Webpack => None,
+                                ServerActionsMode::Turbopack => Some(("", "")),
+                            },
+                        )
+                        .into(),
+                    ))),
+                })));
             } else {
                 match self.mode {
                     ServerActionsMode::Webpack => {
@@ -3289,9 +3302,14 @@ fn emit_error(error_kind: ServerActionsErrorKind) {
 fn program_to_data_url(
     file_name: &str,
     cm: &Arc<SourceMap>,
-    body: Vec<ModuleItem>,
+    mut body: Vec<ModuleItem>,
     prepend_comment: Comment,
 ) -> String {
+    body.push(ModuleItem::Stmt(Stmt::Expr(ExprStmt {
+        span: DUMMY_SP,
+        expr: Box::new(Expr::Lit(Lit::Str(prepend_comment.text.clone().into()))),
+    })));
+
     let module_span = Span::dummy_with_cmt();
     let comments = SingleThreadedComments::default();
     comments.add_leading(module_span.lo, prepend_comment);

test/production/app-dir/actions-tree-shaking/basic/app/actions.js

@@ -1,13 +1,5 @@
 'use server'
 
-export async function serverComponentAction() {
-  return 'server-action'
-}
-
 export async function clientComponentAction() {
   return 'client-action'
 }
-
-export async function unusedExportedAction() {
-  return 'unused-exported-action'
-}

test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js

@@ -20,17 +20,10 @@ import {
       const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
 
       expect(actionsRoutesState).toMatchObject({
-        // only one server layer action
-        'app/server/page': {
-          rsc: 3,
-        },
         // only one browser layer action
         'app/client/page': {
           'action-browser': 1,
         },
-        'app/inline/page': {
-          rsc: 1,
-        },
       })
     })
   }