From 7c2e7c660804afca823d60e6496aa853f75db16c Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Thu, 10 Sep 2020 09:57:45 -0400
Subject: Use gotham-like state for ops (#7385)

Provides a concrete state type that can be dynamically added. This is necessary for op crates.
* renames BasicState to OpState
* async ops take `Rc<RefCell<OpState>>`
* sync ops take `&mut OpState`
* removes `OpRegistry`, `OpRouter` traits
* `get_error_class_fn` moved to OpState
* ResourceTable moved to OpState
---
 cli/ops/runtime_compiler.rs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'cli/ops/runtime_compiler.rs')

diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs
index 71974e6da..d806b0133 100644
--- a/cli/ops/runtime_compiler.rs
+++ b/cli/ops/runtime_compiler.rs
@@ -1,21 +1,21 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 use crate::futures::FutureExt;
-use crate::state::State;
 use crate::tsc::runtime_bundle;
 use crate::tsc::runtime_compile;
 use crate::tsc::runtime_transpile;
 use deno_core::BufVec;
 use deno_core::ErrBox;
-use deno_core::OpRegistry;
+use deno_core::OpState;
 use serde_derive::Deserialize;
 use serde_json::Value;
+use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;
 
-pub fn init(s: &Rc<State>) {
-  s.register_op_json_async("op_compile", op_compile);
-  s.register_op_json_async("op_transpile", op_transpile);
+pub fn init(rt: &mut deno_core::JsRuntime) {
+  super::reg_json_async(rt, "op_compile", op_compile);
+  super::reg_json_async(rt, "op_transpile", op_transpile);
 }
 
 #[derive(Deserialize, Debug)]
@@ -28,14 +28,15 @@ struct CompileArgs {
 }
 
 async fn op_compile(
-  state: Rc<State>,
+  state: Rc<RefCell<OpState>>,
   args: Value,
   _data: BufVec,
 ) -> Result<Value, ErrBox> {
-  state.check_unstable("Deno.compile");
+  let cli_state = super::cli_state2(&state);
+  cli_state.check_unstable("Deno.compile");
   let args: CompileArgs = serde_json::from_value(args)?;
-  let global_state = state.global_state.clone();
-  let permissions = state.permissions.borrow().clone();
+  let global_state = cli_state.global_state.clone();
+  let permissions = cli_state.permissions.borrow().clone();
   let fut = if args.bundle {
     runtime_bundle(
       &global_state,
@@ -66,14 +67,15 @@ struct TranspileArgs {
 }
 
 async fn op_transpile(
-  state: Rc<State>,
+  state: Rc<RefCell<OpState>>,
   args: Value,
   _data: BufVec,
 ) -> Result<Value, ErrBox> {
-  state.check_unstable("Deno.transpile");
+  let cli_state = super::cli_state2(&state);
+  cli_state.check_unstable("Deno.transpile");
   let args: TranspileArgs = serde_json::from_value(args)?;
-  let global_state = state.global_state.clone();
-  let permissions = state.permissions.borrow().clone();
+  let global_state = cli_state.global_state.clone();
+  let permissions = cli_state.permissions.borrow().clone();
   let result =
     runtime_transpile(&global_state, permissions, &args.sources, &args.options)
       .await?;
-- 
cgit v1.2.3