Overhaul extensions for easier maintenance

Author: rscarson

Cargo.lock

@@ -11,7 +11,7 @@ categories = ["web-programming", "network-programming", "api-bindings", "compile
 readme = "readme.md"
 
 [features]
-default = ["worker", "web_stub", "console", "url", "crypto"]
+default = ["worker", "web_stub", "console", "url", "crypto", "web"]
 
 no_extensions = []
 all = ["web", "io", "webstorage", "cache", "websocket"]
@@ -52,7 +52,7 @@ web_stub = ["webidl"]
     # Timers, events, text encoder/decoder, 
     # [https://w3c.github.io/FileAPI]
     # [https://fetch.spec.whatwg.org/]
-    web = ["deno_web", "webidl", "deno_tls", "deno_fetch", "deno_net", "console", "url", "crypto", "url_import", "fs_import"]
+    web = ["deno_web", "webidl", "deno_tls", "deno_fetch", "deno_net", "console", "url", "crypto", "url_import", "fs_import", "http"]
 
     # [https://webidl.spec.whatwg.org/]
     webidl = ["deno_webidl"]
@@ -100,7 +100,8 @@ tokio = "1.38.1"
 
 # For URL imports
 # Pinned for now due to upstream issues
-reqwest = { version = "=0.12.4", optional = true, default-features = false, features = ["blocking", "rustls-tls"] }
+reqwest = { version = "=0.12.5", optional = true, default-features = false, features = ["blocking", "rustls-tls"] }
+http = { version = "1.1.0", optional = true }
 
 # Dependencies for the various extension features
 deno_cache = {version = "0.94.0", optional = true}

Cargo.toml

@@ -1,3 +1,4 @@
+use super::ExtensionTrait;
 use deno_core::{extension, Extension};
 
 extension!(
@@ -6,21 +7,25 @@ extension!(
     esm_entry_point = "ext:init_cache/init_cache.js",
     esm = [ dir "src/ext/cache", "init_cache.js" ],
 );
-
-pub fn extensions(
-    cache: Option<deno_cache::CreateCache<deno_cache::SqliteBackedCache>>,
-) -> Vec<Extension> {
-    vec![
-        deno_cache::deno_cache::init_ops_and_esm::<deno_cache::SqliteBackedCache>(cache),
-        init_cache::init_ops_and_esm(),
-    ]
+impl ExtensionTrait<()> for init_cache {
+    fn init(_: ()) -> Extension {
+        init_cache::init_ops_and_esm()
+    }
+}
+impl ExtensionTrait<Option<deno_cache::CreateCache<deno_cache::SqliteBackedCache>>>
+    for deno_cache::deno_cache
+{
+    fn init(options: Option<deno_cache::CreateCache<deno_cache::SqliteBackedCache>>) -> Extension {
+        deno_cache::deno_cache::init_ops_and_esm::<deno_cache::SqliteBackedCache>(options)
+    }
 }
 
-pub fn snapshot_extensions(
-    cache: Option<deno_cache::CreateCache<deno_cache::SqliteBackedCache>>,
+pub fn extensions(
+    options: Option<deno_cache::CreateCache<deno_cache::SqliteBackedCache>>,
+    is_snapshot: bool,
 ) -> Vec<Extension> {
     vec![
-        deno_cache::deno_cache::init_ops::<deno_cache::SqliteBackedCache>(cache),
-        init_cache::init_ops(),
+        deno_cache::deno_cache::build(options, is_snapshot),
+        init_cache::build((), is_snapshot),
     ]
 }

src/ext/cache/mod.rs

@@ -1,21 +1,26 @@
+use super::ExtensionTrait;
 use deno_core::{extension, Extension};
+
 extension!(
     init_console,
     deps = [rustyscript],
     esm_entry_point = "ext:init_console/init_console.js",
     esm = [ dir "src/ext/console", "init_console.js" ],
 );
-
-pub fn extensions() -> Vec<Extension> {
-    vec![
-        deno_console::deno_console::init_ops_and_esm(),
-        init_console::init_ops_and_esm(),
-    ]
+impl ExtensionTrait<()> for init_console {
+    fn init((): ()) -> Extension {
+        init_console::init_ops_and_esm()
+    }
+}
+impl ExtensionTrait<()> for deno_console::deno_console {
+    fn init((): ()) -> Extension {
+        deno_console::deno_console::init_ops_and_esm()
+    }
 }
 
-pub fn snapshot_extensions() -> Vec<Extension> {
+pub fn extensions(is_snapshot: bool) -> Vec<Extension> {
     vec![
-        deno_console::deno_console::init_ops(),
-        init_console::init_ops(),
+        deno_console::deno_console::build((), is_snapshot),
+        init_console::build((), is_snapshot),
     ]
 }

src/ext/console/mod.rs

@@ -1,21 +1,26 @@
+use super::ExtensionTrait;
 use deno_core::{extension, Extension};
+
 extension!(
     init_crypto,
     deps = [rustyscript],
     esm_entry_point = "ext:init_crypto/init_crypto.js",
     esm = [ dir "src/ext/crypto", "init_crypto.js" ],
 );
-
-pub fn extensions(seed: Option<u64>) -> Vec<Extension> {
-    vec![
-        deno_crypto::deno_crypto::init_ops_and_esm(seed),
-        init_crypto::init_ops_and_esm(),
-    ]
+impl ExtensionTrait<()> for init_crypto {
+    fn init((): ()) -> Extension {
+        init_crypto::init_ops_and_esm()
+    }
+}
+impl ExtensionTrait<Option<u64>> for deno_crypto::deno_crypto {
+    fn init(seed: Option<u64>) -> Extension {
+        deno_crypto::deno_crypto::init_ops_and_esm(seed)
+    }
 }
 
-pub fn snapshot_extensions(seed: Option<u64>) -> Vec<Extension> {
+pub fn extensions(seed: Option<u64>, is_snapshot: bool) -> Vec<Extension> {
     vec![
-        deno_crypto::deno_crypto::init_ops(seed),
-        init_crypto::init_ops(),
+        deno_crypto::deno_crypto::build(seed, is_snapshot),
+        init_crypto::build((), is_snapshot),
     ]
 }