feat: support external specifiers (#54)

Author: littledivy

.github/workflows/ci.yml

@@ -33,12 +33,12 @@ jobs:
           echo "$HOME/.deno/bin" >> $GITHUB_PATH
 
       - name: Clippy
-        run: cargo clippy --all-targets
+        run: cargo clippy --all-targets --locked
 
       - name: Build
         run: make
 
       - name: Test
         run: | 
-          cargo test --all-targets
+          cargo test --all-targets --locked
           make test

Cargo.lock

@@ -35,8 +35,8 @@ path = "src/examples/load.rs"
 [dependencies]
 anyhow = "1"
 base64 = "0.13.0"
-deno_ast = { version = "0.10.0", features = ["transpiling"] }
-deno_graph = "0.21.0"
+deno_ast = { version = "0.11.0", features = ["transpiling"] }
+deno_graph = "0.23.0"
 futures = "0.3.19"
 serde = "1"
 serde_json = "1"

Cargo.toml

@@ -85,5 +85,5 @@ make: *** [build] Error 1
 
 mean that `wasm-bindgen-cli` doesn't match version specified in `Cargo.toml`.
 
-To fix it, run `cargo install wasm-bindgen-cli@VERSION` where `VERSION` matches
+To fix it, run `cargo install wasm-bindgen-cli --version VERSION` where `VERSION` matches
 what's specified in `Cargo.toml`.

README.md

@@ -14,9 +14,9 @@ crate-type = ["cdylib"]
 [dependencies]
 js-sys = { version = "0.3.55" }
 web-sys = { version = "0.3.56", features = ["ReadableStreamByobReader"] }
-deno_graph = { version = "0.21.0"}
+deno_graph = { version = "0.23.0" }
 eszip = { path = "../", version = "0.15.1" }
-wasm-bindgen = { version = "0.2.78", features = ["serde-serialize"] }
+wasm-bindgen = { version = "0.2.79", features = ["serde-serialize"] }
 wasm-bindgen-futures = { version = "0.4.28" }
 tokio = { version = "1.16", features = ["io-std", "io-util"] }
 console_error_panic_hook = "0.1.7"

lib/Cargo.toml

@@ -8,9 +8,18 @@ Deno.test("roundtrip build + parse", async () => {
   const eszip = await build([
     "https://example.com/mod.ts",
     "https://example.com/a.ts",
+    "external:main.js",
   ], async (specifier: string) => {
+    if (specifier === "external:main.js") {
+      return {
+        kind: "external",
+        specifier,
+      };
+    }
+
     if (specifier === "https://example.com/a.ts") {
       return {
+        kind: "module",
         specifier,
         headers: {
           "content-type": "text/typescript",
@@ -20,6 +29,7 @@ Deno.test("roundtrip build + parse", async () => {
     }
 
     return {
+      kind: "module",
       specifier: "https://example.com/mod.ts",
       headers: {
         "content-type": "application/typescript",

lib/eszip_test.ts

@@ -347,10 +347,6 @@ const imports = {
       var ret = getStringFromWasm0(arg0, arg1);
       return addHeapObject(ret);
     },
-    __wbg_resolve_4f8f547f26b30b27: function (arg0) {
-      var ret = Promise.resolve(getObject(arg0));
-      return addHeapObject(ret);
-    },
     __wbindgen_json_serialize: function (arg0, arg1) {
       const obj = getObject(arg1);
       var ret = JSON.stringify(obj === undefined ? null : obj);
@@ -363,14 +359,6 @@ const imports = {
       getInt32Memory0()[arg0 / 4 + 1] = len0;
       getInt32Memory0()[arg0 / 4 + 0] = ptr0;
     },
-    __wbg_new_16f24b0728c5e67b: function () {
-      var ret = new Array();
-      return addHeapObject(ret);
-    },
-    __wbg_push_a72df856079e6930: function (arg0, arg1) {
-      var ret = getObject(arg0).push(getObject(arg1));
-      return ret;
-    },
     __wbindgen_memory: function () {
       var ret = wasm.memory;
       return addHeapObject(ret);
@@ -391,6 +379,18 @@ const imports = {
       var ret = new Uint8Array(getObject(arg0));
       return addHeapObject(ret);
     },
+    __wbg_new_16f24b0728c5e67b: function () {
+      var ret = new Array();
+      return addHeapObject(ret);
+    },
+    __wbg_push_a72df856079e6930: function (arg0, arg1) {
+      var ret = getObject(arg0).push(getObject(arg1));
+      return ret;
+    },
+    __wbg_resolve_4f8f547f26b30b27: function (arg0) {
+      var ret = Promise.resolve(getObject(arg0));
+      return addHeapObject(ret);
+    },
     __wbg_newwithlength_5f4ce114a24dfe1e: function (arg0) {
       var ret = new Uint8Array(arg0 >>> 0);
       return addHeapObject(ret);
@@ -580,8 +580,8 @@ const imports = {
       var ret = getObject(arg0).then(getObject(arg1));
       return addHeapObject(ret);
     },
-    __wbindgen_closure_wrapper8780: function (arg0, arg1, arg2) {
-      var ret = makeMutClosure(arg0, arg1, 126, __wbg_adapter_24);
+    __wbindgen_closure_wrapper8872: function (arg0, arg1, arg2) {
+      var ret = makeMutClosure(arg0, arg1, 129, __wbg_adapter_24);
       return addHeapObject(ret);
     },
   },

lib/eszip_wasm.generated.js

@@ -1,7 +1,9 @@
 // Adapted from deno_graph
 // https://github.com/denoland/deno_graph/blob/main/lib/loader.ts
 
-export interface LoadResponse {
+export interface LoadResponseModule {
+  /** A module with code has been loaded. */
+  kind: "module";
   /** The string URL of the resource. If there were redirects, the final
    * specifier should be set here, otherwise the requested specifier. */
   specifier: string;
@@ -12,6 +14,16 @@ export interface LoadResponse {
   content: string;
 }
 
+export interface LoadResponseExternalBuiltIn {
+  /** The loaded module is either _external_ or _built-in_ to the runtime. */
+  kind: "external" | "builtIn";
+  /** The strung URL of the resource. If there were redirects, the final
+   * specifier should be set here, otherwise the requested specifier. */
+  specifier: string;
+}
+
+export type LoadResponse = LoadResponseModule | LoadResponseExternalBuiltIn;
+
 export async function load(
   specifier: string,
 ): Promise<LoadResponse | undefined> {
@@ -21,6 +33,7 @@ export async function load(
       case "file:": {
         const content = await Deno.readTextFile(url);
         return {
+          kind: "module",
           specifier,
           content,
         };
@@ -39,6 +52,7 @@ export async function load(
           headers[key.toLowerCase()] = value;
         }
         return {
+          kind: "module",
           specifier: response.url,
           headers,
           content,

lib/eszip_wasm_bg.wasm

@@ -23,12 +23,16 @@ async fn main() {
           .await
           .unwrap()
           .unwrap();
-      let import_map =
-        import_map::parse_from_json(&resp.specifier, &resp.content).unwrap();
-      (
-        Some(import_map.import_map),
-        Some((resp.specifier, resp.content)),
-      )
+      match resp {
+        deno_graph::source::LoadResponse::Module {
+          specifier, content, ..
+        } => {
+          let import_map =
+            import_map::parse_from_json(&specifier, &content).unwrap();
+          (Some(import_map.import_map), Some((specifier, content)))
+        }
+        _ => unimplemented!(),
+      }
     } else {
       (None, None)
     };
@@ -111,7 +115,7 @@ impl deno_graph::source::Loader for Loader {
             tokio::fs::canonicalize(specifier.to_file_path().unwrap()).await?;
           let content = tokio::fs::read(&path).await?;
           let content = String::from_utf8(content)?;
-          Ok(Some(deno_graph::source::LoadResponse {
+          Ok(Some(deno_graph::source::LoadResponse::Module {
             specifier: Url::from_file_path(&path).unwrap(),
             maybe_headers: None,
             content: Arc::new(content),
@@ -136,7 +140,7 @@ impl deno_graph::source::Loader for Loader {
             }
             let url = resp.url().clone();
             let content = resp.text().await?;
-            Ok(Some(deno_graph::source::LoadResponse {
+            Ok(Some(deno_graph::source::LoadResponse::Module {
               specifier: url,
               maybe_headers: Some(headers),
               content: Arc::new(content),