Unverified Commit b6b5ab88 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: apply effects in tests (#72952)

https://github.com/vercel/next.js/pull/72847 missed this
parent 8856f49f
...@@ -12,7 +12,7 @@ use dunce::canonicalize; ...@@ -12,7 +12,7 @@ use dunce::canonicalize;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion, ResolvedVc, apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion, ResolvedVc,
TryJoinIterExt, TurboTasks, Value, Vc, TryJoinIterExt, TurboTasks, Value, Vc,
}; };
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
...@@ -66,6 +66,8 @@ struct JsResult { ...@@ -66,6 +66,8 @@ struct JsResult {
jest_result: JestRunResult, jest_result: JestRunResult,
} }
#[turbo_tasks::value]
#[derive(Copy, Clone, Debug, Hash)]
enum IssueSnapshotMode { enum IssueSnapshotMode {
Snapshots, Snapshots,
NoSnapshots, NoSnapshots,
...@@ -168,18 +170,29 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe ...@@ -168,18 +170,29 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe
let tt = TurboTasks::new(MemoryBackend::default()); let tt = TurboTasks::new(MemoryBackend::default());
tt.run_once(async move { tt.run_once(async move {
let resource_str = resource.to_str().unwrap(); let emit = run_inner(resource.to_str().unwrap().into(), Value::new(snapshot_mode));
let prepared_test = prepare_test(resource_str.into()); let result = emit.strongly_consistent().await?;
let run_result = run_test(prepared_test); apply_effects(emit).await?;
if matches!(snapshot_mode, IssueSnapshotMode::Snapshots) {
snapshot_issues(prepared_test, run_result).await?;
}
Ok((*run_result.await.unwrap().js_result.await.unwrap()).clone()) Ok(result.clone_value())
}) })
.await .await
} }
#[turbo_tasks::function]
async fn run_inner(
resource: RcStr,
snapshot_mode: Value<IssueSnapshotMode>,
) -> Result<Vc<JsResult>> {
let prepared_test = prepare_test(resource);
let run_result = run_test(prepared_test);
if *snapshot_mode == IssueSnapshotMode::Snapshots {
snapshot_issues(prepared_test, run_result).await?;
}
Ok(run_result.await?.js_result)
}
#[derive(PartialEq, Eq, Debug, Default, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(PartialEq, Eq, Debug, Default, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)]
#[serde(rename_all = "camelCase", deny_unknown_fields)] #[serde(rename_all = "camelCase", deny_unknown_fields)]
struct TestOptions { struct TestOptions {
......
...@@ -15,7 +15,8 @@ use serde::Deserialize; ...@@ -15,7 +15,8 @@ use serde::Deserialize;
use serde_json::json; use serde_json::json;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
ReadConsistency, ReadRef, ResolvedVc, TryJoinIterExt, TurboTasks, Value, ValueToString, Vc, apply_effects, ReadConsistency, ReadRef, ResolvedVc, TryJoinIterExt, TurboTasks, Value,
ValueToString, Vc,
}; };
use turbo_tasks_env::DotenvProcessEnv; use turbo_tasks_env::DotenvProcessEnv;
use turbo_tasks_fs::{ use turbo_tasks_fs::{
...@@ -156,19 +157,10 @@ async fn run(resource: PathBuf) -> Result<()> { ...@@ -156,19 +157,10 @@ async fn run(resource: PathBuf) -> Result<()> {
let tt = TurboTasks::new(MemoryBackend::default()); let tt = TurboTasks::new(MemoryBackend::default());
let task = tt.spawn_once_task(async move { let task = tt.spawn_once_task(async move {
let out = run_test(resource.to_str().unwrap().into()); let emit = run_inner(resource.to_str().unwrap().into());
let _ = out.resolve_strongly_consistent().await?; emit.strongly_consistent().await?;
let captured_issues = out.peek_issues_with_path().await?; apply_effects(emit).await?;
let plain_issues = captured_issues
.iter_with_shortest_path()
.map(|(issue_vc, path)| async move { issue_vc.into_plain(path).await })
.try_join()
.await?;
snapshot_issues(plain_issues, out.join("issues".into()), &REPO_ROOT)
.await
.context("Unable to handle issues")?;
Ok(Vc::<()>::default()) Ok(Vc::<()>::default())
}); });
tt.wait_task_completion(task, ReadConsistency::Strong) tt.wait_task_completion(task, ReadConsistency::Strong)
...@@ -177,6 +169,25 @@ async fn run(resource: PathBuf) -> Result<()> { ...@@ -177,6 +169,25 @@ async fn run(resource: PathBuf) -> Result<()> {
Ok(()) Ok(())
} }
#[turbo_tasks::function]
async fn run_inner(resource: RcStr) -> Result<()> {
let out = run_test(resource);
let _ = out.resolve_strongly_consistent().await?;
let captured_issues = out.peek_issues_with_path().await?;
let plain_issues = captured_issues
.iter_with_shortest_path()
.map(|(issue_vc, path)| async move { issue_vc.into_plain(path).await })
.try_join()
.await?;
snapshot_issues(plain_issues, out.join("issues".into()), &REPO_ROOT)
.await
.context("Unable to handle issues")?;
Ok(())
}
#[turbo_tasks::function] #[turbo_tasks::function]
async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> { async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> {
let test_path = canonicalize(&resource)?; let test_path = canonicalize(&resource)?;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment