Moved from gosub_js to gosub_webexecutor

Cargo.toml

@@ -44,7 +44,7 @@ gosub_net = { path = "./crates/gosub-net", features = [] }
 gosub_config = { path = "./crates/gosub-config", features = [] }
 gosub_html5 = { path = "./crates/gosub-html5", features = [] }
 gosub_css3 = { path = "./crates/gosub-css3", features = [] }
-gosub_js = { path = "./crates/gosub-js", features = [] }
+gosub_webexecutor = { path = "./crates/gosub-webexecutor", features = [] }
 gosub_jsapi = { path = "./crates/gosub-jsapi", features = [] }
 gosub_testing = { path = "./crates/gosub-testing", features = [] }
 serde = { version = "1.0", features = ["derive"] }

crates/gosub-js/Cargo.toml → crates/gosub-webexecutor/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gosub_js"
+name = "gosub_webexecutor"
 version = "0.1.0"
 edition = "2021"
 authors = ["Gosub Community <[email protected]>"]

crates/gosub-js/src/web_executor/js.rs → crates/gosub-webexecutor/src/js.rs

@@ -2,7 +2,7 @@ use lazy_static::lazy_static;
 use std::sync::Mutex;
 use thiserror::Error;
 
-use crate::web_executor::js::v8::V8Engine;
+use crate::js::v8::V8Engine;
 pub use compile::*;
 pub use context::*;
 pub use function::*;

crates/gosub-js/src/web_executor/js/compile.rs → crates/gosub-webexecutor/src/js/compile.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSContext, JSRuntime, JSValue};
+use crate::js::{JSContext, JSRuntime, JSValue};
 use gosub_shared::types::Result;
 
 //compiled code will be stored with this trait for later execution (e.g HTML parsing not done yet)

crates/gosub-js/src/web_executor/js/context.rs → crates/gosub-webexecutor/src/js/context.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSArray, JSCompiled, JSFunction, JSObject, JSRuntime, JSValue};
+use crate::js::{JSArray, JSCompiled, JSFunction, JSObject, JSRuntime, JSValue};
 use gosub_shared::types::Result;
 
 //main trait for JS context (can be implemented for different JS engines like V8, SpiderMonkey, JSC, etc.)

crates/gosub-js/src/web_executor/js/function.rs → crates/gosub-webexecutor/src/js/function.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSContext, JSError, JSObject, JSRuntime, JSValue};
+use crate::js::{JSContext, JSError, JSObject, JSRuntime, JSValue};
 use core::fmt::Display;
 use gosub_shared::types::Result;
 

crates/gosub-js/src/web_executor/js/interop.rs → crates/gosub-webexecutor/src/js/interop.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::JSRuntime;
+use crate::js::JSRuntime;
 use gosub_shared::types::Result;
 use std::cell::RefCell;
 use std::rc::Rc;

crates/gosub-js/src/web_executor/js/object.rs → crates/gosub-webexecutor/src/js/object.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSContext, JSFunction, JSFunctionVariadic, JSRuntime, JSValue};
+use crate::js::{JSContext, JSFunction, JSFunctionVariadic, JSRuntime, JSValue};
 use core::fmt::Display;
 use gosub_shared::types::Result;
 

crates/gosub-js/src/web_executor/js/runtime.rs → crates/gosub-webexecutor/src/js/runtime.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{
+use crate::js::{
     Args, JSArray, JSCompiled, JSContext, JSFunction, JSFunctionCallBack,
     JSFunctionCallBackVariadic, JSFunctionVariadic, JSGetterCallback, JSObject, JSSetterCallback,
     JSValue, ValueConversion, VariadicArgs, VariadicArgsInternal,

crates/gosub-js/src/web_executor/js/v8.rs → crates/gosub-webexecutor/src/js/v8.rs

@@ -11,9 +11,7 @@ pub use function::*;
 pub use object::*;
 pub use value::*;
 
-use crate::web_executor::js::{
-    JSArray, JSContext, JSFunction, JSObject, JSRuntime, JSValue, ValueConversion,
-};
+use crate::js::{JSArray, JSContext, JSFunction, JSObject, JSRuntime, JSValue, ValueConversion};
 use gosub_shared::types::Result;
 
 mod array;
@@ -122,21 +120,21 @@ mod tests {
     use anyhow;
     use colored::Colorize;
 
-    use crate::web_executor::js::v8::PLATFORM_INITIALIZED;
-    use crate::web_executor::js::{JSContext, JSError, JSRuntime, JSValue};
+    use crate::js::v8::PLATFORM_INITIALIZED;
+    use crate::js::{JSContext, JSError, JSRuntime, JSValue};
     use crate::Error;
     use crate::Error::JS;
 
     #[test]
     fn v8_engine_initialization() {
-        let mut engine = crate::web_executor::js::v8::V8Engine::new();
+        let mut engine = crate::js::v8::V8Engine::new();
 
         assert!(PLATFORM_INITIALIZED.load(Ordering::SeqCst));
     }
 
     #[test]
     fn v8_js_execution() {
-        let mut engine = crate::web_executor::js::v8::V8Engine::new();
+        let mut engine = crate::js::v8::V8Engine::new();
         let mut context = engine.new_context().unwrap();
 
         let value = context
@@ -154,7 +152,7 @@ mod tests {
 
     #[test]
     fn v8_run_invalid_syntax() {
-        let mut engine = crate::web_executor::js::v8::V8Engine::new();
+        let mut engine = crate::js::v8::V8Engine::new();
 
         let mut context = engine.new_context().unwrap();
 
@@ -175,7 +173,7 @@ mod tests {
 
     #[test]
     fn v8_context_creation() {
-        let mut engine = crate::web_executor::js::v8::V8Engine::new();
+        let mut engine = crate::js::v8::V8Engine::new();
 
         let context = engine.new_context();
         assert!(context.is_ok());

crates/gosub-js/src/web_executor/js/v8/array.rs → crates/gosub-webexecutor/src/js/v8/array.rs

@@ -1,7 +1,7 @@
 use v8::{Array, Local};
 
-use crate::web_executor::js::v8::{V8Context, V8Engine, V8Value};
-use crate::web_executor::js::{JSArray, JSError, JSRuntime};
+use crate::js::v8::{V8Context, V8Engine, V8Value};
+use crate::js::{JSArray, JSError, JSRuntime};
 use crate::Error;
 use gosub_shared::types::Result;
 

crates/gosub-js/src/web_executor/js/v8/compile.rs → crates/gosub-webexecutor/src/js/v8/compile.rs

@@ -1,5 +1,5 @@
-use crate::web_executor::js::v8::{FromContext, V8Context, V8Ctx, V8Engine, V8Value};
-use crate::web_executor::js::{JSCompiled, JSRuntime};
+use crate::js::v8::{FromContext, V8Context, V8Ctx, V8Engine, V8Value};
+use crate::js::{JSCompiled, JSRuntime};
 use gosub_shared::types::Result;
 use std::rc::Rc;
 use v8::{Local, Script};

crates/gosub-js/src/web_executor/js/v8/context.rs → crates/gosub-webexecutor/src/js/v8/context.rs

@@ -7,10 +7,10 @@ use v8::{
     TryCatch,
 };
 
-use crate::web_executor::js::compile::JSCompiled;
-use crate::web_executor::js::v8::compile::V8Compiled;
-use crate::web_executor::js::v8::{FromContext, V8Context, V8Engine, V8Object, V8Value};
-use crate::web_executor::js::{JSContext, JSError, JSRuntime};
+use crate::js::compile::JSCompiled;
+use crate::js::v8::compile::V8Compiled;
+use crate::js::v8::{FromContext, V8Context, V8Engine, V8Object, V8Value};
+use crate::js::{JSContext, JSError, JSRuntime};
 use crate::Error;
 use gosub_shared::types::Result;
 

crates/gosub-js/src/web_executor/js/v8/function.rs → crates/gosub-webexecutor/src/js/v8/function.rs

@@ -6,9 +6,9 @@ use v8::{
     FunctionCallbackInfo, Local, ReturnValue,
 };
 
-use crate::web_executor::js::function::{JSFunctionCallBack, JSFunctionCallBackVariadic};
-use crate::web_executor::js::v8::{ctx_from_function_callback_info, V8Context, V8Engine, V8Value};
-use crate::web_executor::js::{
+use crate::js::function::{JSFunctionCallBack, JSFunctionCallBackVariadic};
+use crate::js::v8::{ctx_from_function_callback_info, V8Context, V8Engine, V8Value};
+use crate::js::{
     Args, JSError, JSFunction, JSFunctionVariadic, JSRuntime, JSValue, VariadicArgs,
     VariadicArgsInternal,
 };

crates/gosub-js/src/web_executor/js/v8/object.rs → crates/gosub-webexecutor/src/js/v8/object.rs

@@ -6,11 +6,11 @@ use v8::{
     ReturnValue, Value,
 };
 
-use crate::web_executor::js::v8::{
+use crate::js::v8::{
     ctx_from, FromContext, V8Context, V8Ctx, V8Engine, V8Function, V8FunctionCallBack,
     V8FunctionVariadic, V8Value,
 };
-use crate::web_executor::js::{
+use crate::js::{
     JSArray, JSError, JSGetterCallback, JSObject, JSRuntime, JSSetterCallback, JSValue,
 };
 use crate::Error;

crates/gosub-js/src/web_executor/js/v8/value.rs → crates/gosub-webexecutor/src/js/v8/value.rs

@@ -2,8 +2,8 @@ use std::rc::Rc;
 
 use v8::{Local, Value};
 
-use crate::web_executor::js::v8::{FromContext, V8Context, V8Engine, V8Object};
-use crate::web_executor::js::{JSError, JSRuntime, JSType, JSValue, ValueConversion};
+use crate::js::v8::{FromContext, V8Context, V8Engine, V8Object};
+use crate::js::{JSError, JSRuntime, JSType, JSValue, ValueConversion};
 use crate::Error;
 use gosub_shared::types::Result;
 

crates/gosub-js/src/web_executor/js/value.rs → crates/gosub-webexecutor/src/js/value.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSArray, JSContext, JSObject, JSRuntime, JSType};
+use crate::js::{JSArray, JSContext, JSObject, JSRuntime, JSType};
 use gosub_shared::types::Result;
 
 pub trait JSValue

crates/gosub-js/src/web_executor/js/value_conversion.rs → crates/gosub-webexecutor/src/js/value_conversion.rs

@@ -1,4 +1,4 @@
-use crate::web_executor::js::{JSContext, JSRuntime, JSValue};
+use crate::js::{JSContext, JSRuntime, JSValue};
 use gosub_shared::types::Result;
 
 //trait to easily convert Rust types to JS values (just call .to_js_value() on the type)

crates/gosub-js/src/lib.rs → crates/gosub-webexecutor/src/lib.rs

@@ -5,10 +5,15 @@
 
 use thiserror::Error;
 
-pub mod web_executor;
+#[allow(unused, unused_imports, unused_variables, dead_code)]
+#[allow(dead_code, unused)]
+pub mod js;
+
+#[cfg(test)]
+mod test;
 
 #[derive(Debug, Error)]
 pub enum Error {
     #[error("js: {0}")]
-    JS(#[from] web_executor::js::JSError),
+    JS(#[from] js::JSError),
 }

crates/gosub-js/src/web_executor/test.rs → crates/gosub-webexecutor/src/test.rs

@@ -4,10 +4,10 @@ use std::ops::Add;
 use std::rc::Rc;
 
 //use webinterop::{web_fns, web_interop};
-use crate::web_executor::js::v8::{
+use crate::js::v8::{
     GetterCallback, SetterCallback, V8Context, V8Engine, V8Function, V8FunctionVariadic, V8Value,
 };
-use crate::web_executor::js::{
+use crate::js::{
     Args, JSContext, JSFunction, JSFunctionCallBack, JSFunctionCallBackVariadic,
     JSFunctionVariadic, JSGetterCallback, JSInterop, JSObject, JSRuntime, JSSetterCallback,
     JSValue, ValueConversion, VariadicArgs, VariadicArgsInternal,

src/bin/run-js.rs

@@ -1,6 +1,6 @@
-use gosub_js::web_executor::js::v8::V8Context;
-use gosub_js::web_executor::js::{JSContext, JSRuntime, JSValue, RUNTIME};
 use gosub_shared::types::Result;
+use gosub_webexecutor::js::v8::V8Context;
+use gosub_webexecutor::js::{JSContext, JSRuntime, JSValue, RUNTIME};
 use std::env::args;
 
 fn main() -> Result<()> {