Extract as_chunk into shared ChunkType trait

Author: jridgewell

packages/next-swc/crates/next-core/src/next_client_component/with_client_chunks.rs

@@ -1,15 +1,15 @@
 use anyhow::{Context, Result};
 use indoc::formatdoc;
-use turbo_tasks::{TryJoinIterExt, Value, ValueToString, Vc};
+use turbo_tasks::{TryJoinIterExt, ValueToString, Vc};
 use turbopack_binding::{
     turbo::tasks_fs::FileSystemPath,
     turbopack::{
         core::{
             asset::{Asset, AssetContent},
             chunk::{
-                availability_info::AvailabilityInfo, Chunk, ChunkData, ChunkItem, ChunkItemExt,
-                ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingContextExt,
-                ChunkingType, ChunkingTypeOption, ChunksData,
+                ChunkData, ChunkItem, ChunkItemExt, ChunkType, ChunkableModule,
+                ChunkableModuleReference, ChunkingContext, ChunkingContextExt, ChunkingType,
+                ChunkingTypeOption, ChunksData,
             },
             ident::AssetIdent,
             module::Module,
@@ -18,11 +18,11 @@ use turbopack_binding::{
             reference::{ModuleReference, ModuleReferences, SingleOutputAssetReference},
             resolve::ModuleResolveResult,
         },
-        ecmascript::chunk::EcmascriptChunkData,
+        ecmascript::chunk::{EcmascriptChunkData, EcmascriptChunkType},
         turbopack::ecmascript::{
             chunk::{
-                EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent,
-                EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports,
+                EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
+                EcmascriptChunkingContext, EcmascriptExports,
             },
             utils::StringifyJs,
         },
@@ -239,12 +239,13 @@ impl ChunkItem for WithClientChunksChunkItem {
     }
 
     #[turbo_tasks::function]
-    fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> {
-        Vc::upcast(EcmascriptChunk::new(
-            Vc::upcast(self.context.with_layer("rsc".to_string())),
-            Vc::upcast(self.inner),
-            availability_info,
-        ))
+    fn ty(&self) -> Vc<Box<dyn ChunkType>> {
+        Vc::upcast(Vc::<EcmascriptChunkType>::default())
+    }
+
+    #[turbo_tasks::function]
+    fn module(&self) -> Vc<Box<dyn Module>> {
+        Vc::upcast(self.inner)
     }
 }
 

packages/next-swc/crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs

@@ -8,7 +8,8 @@ use turbopack_binding::turbopack::{
     core::{
         asset::{Asset, AssetContent},
         chunk::{
-            availability_info::AvailabilityInfo, Chunk, ChunkItem, ChunkableModule, ChunkingContext,
+            availability_info::AvailabilityInfo, ChunkItem, ChunkType, ChunkableModule,
+            ChunkingContext,
         },
         code_builder::CodeBuilder,
         context::AssetContext,
@@ -20,8 +21,8 @@ use turbopack_binding::turbopack::{
     },
     ecmascript::{
         chunk::{
-            EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent,
-            EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports,
+            EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
+            EcmascriptChunkType, EcmascriptChunkingContext, EcmascriptExports,
         },
         utils::StringifyJs,
         EcmascriptModuleAsset,
@@ -238,12 +239,13 @@ impl ChunkItem for ProxyModuleChunkItem {
     }
 
     #[turbo_tasks::function]
-    fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> {
-        Vc::upcast(EcmascriptChunk::new(
-            Vc::upcast(self.chunking_context),
-            Vc::upcast(self.client_proxy_asset),
-            availability_info,
-        ))
+    fn ty(&self) -> Vc<Box<dyn ChunkType>> {
+        Vc::upcast(Vc::<EcmascriptChunkType>::default())
+    }
+
+    #[turbo_tasks::function]
+    fn module(&self) -> Vc<Box<dyn Module>> {
+        Vc::upcast(self.client_proxy_asset)
     }
 }
 

packages/next-swc/crates/next-core/src/next_server_component/server_component_module.rs

@@ -1,22 +1,20 @@
 use anyhow::{bail, Context, Result};
 use indoc::formatdoc;
-use turbo_tasks::{Value, Vc};
+use turbo_tasks::Vc;
 use turbo_tasks_fs::FileSystemPath;
 use turbopack_binding::turbopack::{
     core::{
         asset::{Asset, AssetContent},
-        chunk::{
-            availability_info::AvailabilityInfo, Chunk, ChunkItem, ChunkItemExt, ChunkableModule,
-            ChunkingContext,
-        },
+        chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
         ident::AssetIdent,
         module::Module,
         reference::ModuleReferences,
     },
+    ecmascript::chunk::EcmascriptChunkType,
     turbopack::ecmascript::{
         chunk::{
-            EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent,
-            EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports,
+            EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
+            EcmascriptChunkingContext, EcmascriptExports,
         },
         utils::StringifyJs,
     },
@@ -161,11 +159,12 @@ impl ChunkItem for BuildServerComponentChunkItem {
     }
 
     #[turbo_tasks::function]
-    fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> {
-        Vc::upcast(EcmascriptChunk::new(
-            Vc::upcast(self.context),
-            Vc::upcast(self.inner),
-            availability_info,
-        ))
+    fn ty(&self) -> Vc<Box<dyn ChunkType>> {
+        Vc::upcast(Vc::<EcmascriptChunkType>::default())
+    }
+
+    #[turbo_tasks::function]
+    fn module(&self) -> Vc<Box<dyn Module>> {
+        Vc::upcast(self.inner)
     }
 }