feat: support importing WebAssembly modules (#519)

* chore: update dependency

* chore: update `Cargo.lock`

* feat: support wasm modules

* chore: add an integration test for wasm module import

Author: nyannyacha

Cargo.lock

@@ -202,7 +202,7 @@ windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_Media
 [patch.crates-io]
 # If the PR is merged upstream, remove the line below.
 deno_core = { git = "https://github.com/supabase/deno_core", branch = "324-supabase" }
-eszip = { git = "https://github.com/supabase/eszip", branch = "fix-pub-vis-0-80-0" }
+eszip = { git = "https://github.com/supabase/eszip", branch = "fix-pub-vis-0-80-1" }
 
 [profile.dind]
 inherits = "dev"

Cargo.toml

@@ -0,0 +1,3 @@
+{
+  "workspace": []
+}

crates/base/test_cases/eszip-wasm/deno.json

@@ -0,0 +1,9 @@
+import { add } from "./math.wasm";
+
+const three = add(1, 2) === 3;
+
+export default {
+  fetch() {
+    return new Response(three ? "meow" : "woem");
+  },
+};

crates/base/test_cases/eszip-wasm/index.ts

@@ -3794,6 +3794,25 @@ async fn test_should_be_able_to_trigger_early_drop_with_mem() {
   unreachable!("test failed");
 }
 
+#[tokio::test]
+#[serial]
+async fn test_eszip_wasm_import() {
+  integration_test!(
+    "./test_cases/main",
+    NON_SECURE_PORT,
+    "eszip-wasm",
+    None,
+    None,
+    None,
+    (|resp| async {
+      let resp = resp.unwrap();
+      assert_eq!(resp.status().as_u16(), 200);
+      assert_eq!(resp.text().await.unwrap().as_str(), "meow");
+    }),
+    TerminationToken::new()
+  );
+}
+
 #[derive(Deserialize)]
 struct ErrorResponsePayload {
   msg: String,

crates/base/test_cases/eszip-wasm/math.wasm

@@ -1,4 +1,4 @@
-// Below is roughly originated from eszip@0.72.2/src/v2.rs
+// Below is roughly originated from eszip@fix-pub-vis-0-80-1/src/v2.rs
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -10,6 +10,7 @@ use eszip::v2::EszipNpmPackageIndex;
 use eszip::v2::EszipV2Module;
 use eszip::v2::EszipV2Modules;
 use eszip::v2::EszipV2SourceSlot;
+use eszip::v2::EszipVersion;
 use eszip::v2::Options;
 use eszip::v2::Section;
 use eszip::EszipV2;
@@ -20,22 +21,28 @@ use futures::AsyncRead;
 use futures::AsyncReadExt;
 use hashlink::LinkedHashMap;
 
-const ESZIP_V2_MAGIC: &[u8; 8] = b"ESZIP_V2";
-const ESZIP_V2_2_MAGIC: &[u8; 8] = b"ESZIP2.2";
-
 pub async fn parse_v2_header<R: AsyncRead + Unpin>(
-  mut reader: &mut BufReader<R>,
+  reader: &mut BufReader<R>,
 ) -> Result<EszipV2, ParseError> {
   let mut magic = [0u8; 8];
   reader.read_exact(&mut magic).await?;
 
-  if !EszipV2::has_magic(&magic) {
+  let Some(version) = EszipVersion::from_magic(&magic) else {
     return Err(ParseError::InvalidV2);
-  }
+  };
+
+  parse_v2_header_inner(version, reader).await
+}
+
+// parse_with_version
+async fn parse_v2_header_inner<R: AsyncRead + Unpin>(
+  version: EszipVersion,
+  mut reader: &mut BufReader<R>,
+) -> Result<EszipV2, ParseError> {
+  let supports_npm = version != EszipVersion::V2;
+  let supports_options = version >= EszipVersion::V2_2;
 
-  let supports_npm = magic != *ESZIP_V2_MAGIC;
-  let supports_options = magic == *ESZIP_V2_2_MAGIC;
-  let mut options = Options::default_for_version(&magic);
+  let mut options = Options::default_for_version(version);
 
   if supports_options {
     let mut pre_options = options;
@@ -82,8 +89,8 @@ pub async fn parse_v2_header<R: AsyncRead + Unpin>(
     }
   }
 
-  let header = Section::read(&mut reader, options).await?;
-  if !header.is_checksum_valid() {
+  let modules_header = Section::read(&mut reader, options).await?;
+  if !modules_header.is_checksum_valid() {
     return Err(ParseError::InvalidV2HeaderHash);
   }
 
@@ -97,16 +104,16 @@ pub async fn parse_v2_header<R: AsyncRead + Unpin>(
   // error.
   macro_rules! read {
     ($n:expr, $err:expr) => {{
-      if read + $n > header.content_len() {
+      if read + $n > modules_header.content_len() {
         return Err(ParseError::InvalidV2Header($err));
       }
       let start = read;
       read += $n;
-      &header.content()[start..read]
+      &modules_header.content()[start..read]
     }};
   }
 
-  while read < header.content_len() {
+  while read < modules_header.content_len() {
     let specifier_len =
       u32::from_be_bytes(read!(4, "specifier len").try_into().unwrap())
         as usize;
@@ -130,6 +137,7 @@ pub async fn parse_v2_header<R: AsyncRead + Unpin>(
           1 => ModuleKind::Json,
           2 => ModuleKind::Jsonc,
           3 => ModuleKind::OpaqueData,
+          4 => ModuleKind::Wasm,
           n => return Err(ParseError::InvalidV2ModuleKind(n, read)),
         };
         let source = if source_offset == 0 && source_len == 0 {

crates/base/tests/integration_tests.rs

@@ -38,6 +38,7 @@ pub async fn create_eszip_from_graph_raw(
   eszip::EszipV2::from_graph(eszip::FromGraphOptions {
     graph,
     parser,
+    module_kind_resolver: Default::default(),
     transpile_options,
     emit_options,
     relative_file_base,

crates/deno_facade/eszip/parse.rs

@@ -404,6 +404,16 @@ impl ModuleLoader for EmbeddedModuleLoader {
           type_error(format!("Module not found: {}", original_specifier))
         })?;
 
+        if module.inner.kind == ModuleKind::Wasm {
+          return Ok(deno_core::ModuleSource::new_with_redirect(
+            ModuleType::Wasm,
+            ModuleSourceCode::Bytes(code.into()),
+            &original_specifier,
+            &module.specifier,
+            None,
+          ));
+        }
+
         let code = arc_u8_to_arc_str(code)
           .map_err(|_| type_error("Module source is not utf-8"))?;
 
@@ -467,7 +477,7 @@ impl ModuleLoader for EmbeddedModuleLoader {
               ModuleKind::Jsonc => {
                 return Err(type_error("jsonc modules not supported"))
               }
-              ModuleKind::OpaqueData => {
+              ModuleKind::OpaqueData | ModuleKind::Wasm => {
                 unreachable!();
               }
             },