From e55b448730160a6e4df9815a268d4049ac89deab Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Fri, 17 Mar 2023 12:22:15 -0600 Subject: feat(core) deno_core::extension! macro to simplify extension registration (#18210) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This implements two macros to simplify extension registration and centralize a lot of the boilerplate as a base for future improvements: * `deno_core::ops!` registers a block of `#[op]`s, optionally with type parameters, useful for places where we share lists of ops * `deno_core::extension!` is used to register an extension, and creates two methods that can be used at runtime/snapshot generation time: `init_ops` and `init_ops_and_esm`. --------- Co-authored-by: Bartek Iwańczuk --- cli/ops/testing.rs | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'cli/ops/testing.rs') diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs index 9170e9400..f32e96147 100644 --- a/cli/ops/testing.rs +++ b/cli/ops/testing.rs @@ -12,7 +12,6 @@ use crate::tools::test::TestStepDescription; use deno_core::error::generic_error; use deno_core::error::AnyError; use deno_core::op; -use deno_core::Extension; use deno_core::ModuleSpecifier; use deno_core::OpState; use deno_runtime::permissions::create_child_permissions; @@ -25,28 +24,27 @@ use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering; use uuid::Uuid; -pub fn init( - sender: TestEventSender, - fail_fast_tracker: FailFastTracker, - filter: TestFilter, -) -> Extension { - Extension::builder("deno_test") - .ops(vec![ - op_pledge_test_permissions::decl(), - op_restore_test_permissions::decl(), - op_get_test_origin::decl(), - op_register_test::decl(), - op_register_test_step::decl(), - op_dispatch_test_event::decl(), - op_tests_should_stop::decl(), - ]) - .state(move |state| { - state.put(sender.clone()); - state.put(fail_fast_tracker.clone()); - state.put(filter.clone()); - }) - .build() -} +deno_core::extension!(deno_test, + ops = [ + op_pledge_test_permissions, + op_restore_test_permissions, + op_get_test_origin, + op_register_test, + op_register_test_step, + op_dispatch_test_event, + op_tests_should_stop, + ], + config = { + sender: TestEventSender, + fail_fast_tracker: FailFastTracker, + filter: TestFilter, + }, + state = |state, sender, fail_fast_tracker, filter| { + state.put(sender); + state.put(fail_fast_tracker); + state.put(filter); + }, +); #[derive(Clone)] struct PermissionsHolder(Uuid, PermissionsContainer); -- cgit v1.2.3