Pass through custom error type factory

Author: bgw

Cargo.lock

@@ -349,7 +349,8 @@ dhat = { version = "0.3.2" }
 dunce = "1.0.3"
 either = "1.9.0"
 erased-serde = "0.4.5"
-futures = "0.3.26"
+futures = "0.3.31"
+futures-util = "0.3.31"
 futures-retry = "0.6.0"
 hashbrown = "0.14.5"
 image = { version = "0.25.0", default-features = false }

Cargo.toml

@@ -58,6 +58,7 @@ anyhow = "1.0.66"
 console-subscriber = { workspace = true, optional = true }
 dhat = { workspace = true, optional = true }
 either = { workspace = true }
+futures-util = { workspace = true }
 owo-colors = { workspace = true }
 napi = { workspace = true }
 napi-derive = "2"

crates/napi/Cargo.toml

@@ -1,6 +1,7 @@
 use std::{ops::Deref, sync::Arc};
 
 use anyhow::Result;
+use futures_util::TryFutureExt;
 use napi::{JsFunction, bindgen_prelude::External};
 use next_api::{
     operation::OptionEndpoint,
@@ -12,7 +13,7 @@ use next_api::{
 };
 use tracing::Instrument;
 use turbo_tasks::{Completion, Effects, OperationVc, ReadRef, Vc};
-use turbopack_core::{diagnostics::PlainDiagnostic, error::PrettyPrintError, issue::PlainIssue};
+use turbopack_core::{diagnostics::PlainDiagnostic, issue::PlainIssue};
 
 use super::utils::{
     DetachedVc, NapiDiagnostic, NapiIssue, RootTask, TurbopackResult,
@@ -125,6 +126,7 @@ async fn get_written_endpoint_with_issues_operation(
 pub async fn endpoint_write_to_disk(
     #[napi(ts_arg_type = "{ __napiType: \"Endpoint\" }")] endpoint: External<ExternalEndpoint>,
 ) -> napi::Result<TurbopackResult<NapiWrittenEndpoint>> {
+    let ctx = endpoint.turbopack_ctx();
     let endpoint_op = ***endpoint;
     let (written, issues, diags) = endpoint
         .turbopack_ctx()
@@ -144,8 +146,8 @@ pub async fn endpoint_write_to_disk(
 
             Ok((written.clone(), issues.clone(), diagnostics.clone()))
         })
-        .await
-        .map_err(|e| napi::Error::from_reason(PrettyPrintError(&e).to_string()))?;
+        .or_else(|e| ctx.throw_turbopack_internal_result(&e))
+        .await?;
     Ok(TurbopackResult {
         result: NapiWrittenEndpoint::from(written.map(ReadRef::into_owned)),
         issues: issues.iter().map(|i| NapiIssue::from(&**i)).collect(),