1 files changed, 55 insertions, 39 deletions
diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs
index f406e64ec..89ca8e0d6 100644
--- a/ext/crypto/lib.rs
+++ b/ext/crypto/lib.rs
@@ -10,6 +10,7 @@ use deno_core::error::type_error;
 use deno_core::error::AnyError;
 use deno_core::include_js_files;
 use deno_core::op;
+use deno_core::ExtensionBuilder;
 
 use deno_core::Extension;
 use deno_core::OpState;
@@ -72,49 +73,64 @@ use crate::key::CryptoNamedCurve;
 use crate::key::HkdfOutput;
 use crate::shared::RawKeyData;
 
-pub fn init(maybe_seed: Option<u64>) -> Extension {
+fn ext() -> ExtensionBuilder {
   Extension::builder_with_deps(
     env!("CARGO_PKG_NAME"),
     &["deno_webidl", "deno_web"],
   )
-  .esm(include_js_files!("00_crypto.js", "01_webidl.js",))
-  .ops(vec![
-    op_crypto_get_random_values::decl(),
-    op_crypto_generate_key::decl(),
-    op_crypto_sign_key::decl(),
-    op_crypto_verify_key::decl(),
-    op_crypto_derive_bits::decl(),
-    op_crypto_import_key::decl(),
-    op_crypto_export_key::decl(),
-    op_crypto_encrypt::decl(),
-    op_crypto_decrypt::decl(),
-    op_crypto_subtle_digest::decl(),
-    op_crypto_random_uuid::decl(),
-    op_crypto_wrap_key::decl(),
-    op_crypto_unwrap_key::decl(),
-    op_crypto_base64url_decode::decl(),
-    op_crypto_base64url_encode::decl(),
-    x25519::op_generate_x25519_keypair::decl(),
-    x25519::op_derive_bits_x25519::decl(),
-    x25519::op_import_spki_x25519::decl(),
-    x25519::op_import_pkcs8_x25519::decl(),
-    ed25519::op_generate_ed25519_keypair::decl(),
-    ed25519::op_import_spki_ed25519::decl(),
-    ed25519::op_import_pkcs8_ed25519::decl(),
-    ed25519::op_sign_ed25519::decl(),
-    ed25519::op_verify_ed25519::decl(),
-    ed25519::op_export_spki_ed25519::decl(),
-    ed25519::op_export_pkcs8_ed25519::decl(),
-    ed25519::op_jwk_x_ed25519::decl(),
-    x25519::op_export_spki_x25519::decl(),
-    x25519::op_export_pkcs8_x25519::decl(),
-  ])
-  .state(move |state| {
-    if let Some(seed) = maybe_seed {
-      state.put(StdRng::seed_from_u64(seed));
-    }
-  })
-  .build()
+}
+
+fn ops(
+  ext: &mut ExtensionBuilder,
+  maybe_seed: Option<u64>,
+) -> &mut ExtensionBuilder {
+  ext
+    .ops(vec![
+      op_crypto_get_random_values::decl(),
+      op_crypto_generate_key::decl(),
+      op_crypto_sign_key::decl(),
+      op_crypto_verify_key::decl(),
+      op_crypto_derive_bits::decl(),
+      op_crypto_import_key::decl(),
+      op_crypto_export_key::decl(),
+      op_crypto_encrypt::decl(),
+      op_crypto_decrypt::decl(),
+      op_crypto_subtle_digest::decl(),
+      op_crypto_random_uuid::decl(),
+      op_crypto_wrap_key::decl(),
+      op_crypto_unwrap_key::decl(),
+      op_crypto_base64url_decode::decl(),
+      op_crypto_base64url_encode::decl(),
+      x25519::op_generate_x25519_keypair::decl(),
+      x25519::op_derive_bits_x25519::decl(),
+      x25519::op_import_spki_x25519::decl(),
+      x25519::op_import_pkcs8_x25519::decl(),
+      ed25519::op_generate_ed25519_keypair::decl(),
+      ed25519::op_import_spki_ed25519::decl(),
+      ed25519::op_import_pkcs8_ed25519::decl(),
+      ed25519::op_sign_ed25519::decl(),
+      ed25519::op_verify_ed25519::decl(),
+      ed25519::op_export_spki_ed25519::decl(),
+      ed25519::op_export_pkcs8_ed25519::decl(),
+      ed25519::op_jwk_x_ed25519::decl(),
+      x25519::op_export_spki_x25519::decl(),
+      x25519::op_export_pkcs8_x25519::decl(),
+    ])
+    .state(move |state| {
+      if let Some(seed) = maybe_seed {
+        state.put(StdRng::seed_from_u64(seed));
+      }
+    })
+}
+
+pub fn init_ops_and_esm(maybe_seed: Option<u64>) -> Extension {
+  ops(&mut ext(), maybe_seed)
+    .esm(include_js_files!("00_crypto.js", "01_webidl.js",))
+    .build()
+}
+
+pub fn init_ops(maybe_seed: Option<u64>) -> Extension {
+  ops(&mut ext(), maybe_seed).build()
 }
 
 #[op]