fix: ts type for ModuleDTOWrapper

web-infra-dev · Aug 7, 2024 · 2b0a045 · 2b0a045
1 parent 9142885
commit 2b0a045
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...s/rspack_binding_options/src/options/raw_split_chunks/raw_split_chunk_cache_group_test.rs b/...s/rspack_binding_options/src/options/raw_split_chunks/raw_split_chunk_cache_group_test.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use napi::bindgen_prelude::Either3;
+use napi::bindgen_prelude::{Either3, FromNapiValue};
 use napi_derive::napi;
 use rspack_binding_values::ModuleDTOWrapper;
 use rspack_napi::regexp::{JsRegExp, JsRegExpExt};
@@ -11,11 +11,21 @@ use tokio::runtime::Handle;
 pub(super) type RawCacheGroupTest =
   Either3<String, JsRegExp, ThreadsafeFunction<JsCacheGroupTestCtx, Option<bool>>>;
 
-#[napi(object)]
+#[napi(object, object_from_js = false)]
 pub struct JsCacheGroupTestCtx {
+  #[napi(ts_type = "ModuleDTO")]
   pub module: ModuleDTOWrapper,
 }
 
+impl FromNapiValue for JsCacheGroupTestCtx {
+  unsafe fn from_napi_value(
+    _env: napi::sys::napi_env,
+    _napi_val: napi::sys::napi_value,
+  ) -> napi::Result<Self> {
+    unreachable!()
+  }
+}
+
 impl<'a> From<CacheGroupTestFnCtx<'a>> for JsCacheGroupTestCtx {
   fn from(value: CacheGroupTestFnCtx<'a>) -> Self {
     JsCacheGroupTestCtx {

diff --git a/crates/rspack_binding_values/src/compilation/mod.rs b/crates/rspack_binding_values/src/compilation/mod.rs
@@ -132,7 +132,7 @@ impl JsCompilation {
       .transpose()
   }
 
-  #[napi(getter)]
+  #[napi(getter, ts_return_type = "ModuleDTO")]
   pub fn modules(&'static self) -> Vec<ModuleDTOWrapper> {
     self
       .0

diff --git a/crates/rspack_binding_values/src/module.rs b/crates/rspack_binding_values/src/module.rs
@@ -282,16 +282,6 @@ impl ToNapiValue for ModuleDTOWrapper {
   }
 }
 
-impl FromNapiValue for ModuleDTOWrapper {
-  unsafe fn from_napi_value(env: sys::napi_env, napi_val: sys::napi_value) -> Result<Self> {
-    let instance: ClassInstance<ModuleDTO> = FromNapiValue::from_napi_value(env, napi_val)?;
-    Ok(ModuleDTOWrapper {
-      module_id: instance.module_id,
-      compilation: instance.compilation,
-    })
-  }
-}
-
 #[derive(Default)]
 #[napi(object)]
 pub struct JsModule {