re-organize crates and imports

.gitignore

@@ -9,8 +9,6 @@ Cargo.lock
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-.vscode/
-
 **types/
 **/doc
 assets/scripts/tlconfig.lua

.vscode/settings.json

@@ -7,6 +7,8 @@
     "rust-analyzer.cargo.features": [
         "lua54",
         "teal",
+        "lua",
+        "rhai"
     ],
     "rust-analyzer.server.extraEnv": {
         "RUSTUP_TOOLCHAIN": "stable"

Cargo.toml

@@ -16,54 +16,38 @@ include= ["readme.md","/src","/examples","/assets","LICENSE"]
 name = "bevy_mod_scripting"
 path = "src/lib.rs"
 
-[package.metadata.docs.rs]
-features = ["lua54","teal","unsafe_lua_modules"]
+# [package.metadata.docs.rs]
+# features = []
 
-[package.metadata.release]
-enable-features=["lua54"]
+# [package.metadata.release]
+# enable-features=[]
 
 [features]
 
 # if enabled enables documentation updating in optimized builds
 doc_always = []
 
-# enables loading possibly unsafe lua modules by lua scripts
-unsafe_lua_modules = []
-
-# enable teal utilities
-teal = []
-
-
-lua51 = ["tealr/mlua_lua51"]
-lua52 = ["tealr/mlua_lua52"]
-lua53 = ["tealr/mlua_lua53"]
-lua54 = ["tealr/mlua_lua54"]
-luajit = ["tealr/mlua_luajit"]
-luajit52 = ["tealr/mlua_luajit52"]
-
-mlua_serialize = ["tealr/mlua_serialize"]
-mlua_macros = ["tealr/mlua_macros"]
 
 [dependencies]
 bevy = { version = "0.8.0", default-features = false, features=["bevy_asset","bevy_gltf","bevy_animation","bevy_core_pipeline","bevy_ui","bevy_pbr","bevy_render","bevy_text","bevy_sprite","filesystem_watcher"]}
-tealr = { version = "0.9.0-alpha1", features=["mlua_vendored","mlua_send"]}
-rhai = { version = "1.7.0", features = ["sync"] }
-anyhow = "1.0.57"
 once_cell = "1.10.0"
 bevy_event_priority = {path = "bevy_event_priority", version = "0.1.1"}
 bevy_mod_scripting_derive = {path = "bevy_mod_scripting_derive", version = "0.1.1"}
 thiserror = "1.0.31"
 lazy_static = "1.4.0"
 paste = "1.0.7"
 parking_lot = "0.12.1"
-serde_json = "1.0.81"
 num-traits = "0.2.15"
-serde = { version = "1", features = ["derive"] }
 smallvec = "1.9.0"
 
 [dev-dependencies]
 # bevy_console = { git = "https://github.com/OnlyGraphs/bevy-console" }
 # bevy_asset_loader = {git = "https://github.com/NiklasEi/bevy_asset_loader", features = ["dynamic_assets"]}
+bevy_script_api= {path="./bevy_script_api", version="0.1.1"}
+bevy_mod_scripting_rhai = {path="languages/bevy_mod_scripting_rhai", version="0.1.1"}
+bevy_mod_scripting_lua = {path="languages/bevy_mod_scripting_lua", version="0.1.1"}
+bevy_mod_scripting_lua_derive = {path="languages/bevy_mod_scripting_lua_derive", version="0.1.1"}
+
 bevy = { version = "0.8.0"}
 rand = "0.8.5"
 serde = "1.0.137"
@@ -84,40 +68,52 @@ criterion = "0.3"
 [[example]]
 name = "complex_game_loop_lua"
 path = "examples/lua/complex_game_loop.rs"
-required-features = ["lua54"]
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54"]
 
 [[example]]
 name = "game_of_life_lua"
 path = "examples/lua/game_of_life.rs"
-required-features = ["lua54","teal"]
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54"]
 
 [[example]]
 name = "event_recipients_lua"
 path = "examples/lua/event_recipients.rs"
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54"]
 
 [[example]]
 name = "documentation_gen_lua"
 path = "examples/lua/documentation_gen.rs"
-required-features = ["lua54"]
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54","bevy_mod_scripting_lua/teal"]
 
 
 [[example]]
 name = "bevy_api_lua"
 path = "examples/lua/bevy_api.rs"
-required-features = ["lua54"]
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54"]
+
+[[example]]
+name = "bevy_api_rhai"
+path = "examples/rhai/bevy_api.rs"
+required-features=["bevy_script_api/rhai"]
 
 [[example]]
 name = "wrappers"
 path = "examples/wrappers.rs"
-required-features = ["lua54"]
+required-features=["bevy_script_api/lua","bevy_mod_scripting_lua/lua54"]
 
 
 [workspace]
 resolver = "2"
 members = [
     "bevy_event_priority",
     "bevy_mod_scripting_derive",
-    "bevy_api_gen"
+    "bevy_api_gen",
+    "bevy_script_api",
+    "languages/bevy_mod_scripting_lua",
+    "languages/bevy_mod_scripting_lua_derive",
+    "languages/bevy_mod_scripting_rhai",
+    # "languages/rhai/derive",
+    "bevy_mod_scripting_common"
 ]
 
 [profile.dev]