pin smol str, begin rhai work

Author: makspll

crates/bevy_mod_scripting_functions/Cargo.toml

@@ -30,5 +30,5 @@ bevy = { workspace = true, features = [
     "multi_threaded"
 ] }
 uuid = "*"
-smol_str = "*"
+smol_str = "0.2.2"
 bevy_mod_scripting_core = { workspace = true }

crates/bevy_mod_scripting_functions/src/core.rs

@@ -4,8 +4,7 @@ use std::borrow::Cow;
 use bevy::{
     prelude::*,
     reflect::{
-        func::{FunctionRegistrationError, FunctionRegistry, FunctionRegistryArc},
-        ParsedPath,
+        func::{FunctionRegistrationError, FunctionRegistry, FunctionRegistryArc}, GetTypeRegistration, ParsedPath
     },
 };
 use bevy_mod_scripting_core::*;
@@ -325,6 +324,11 @@ pub fn register_reflect_reference_functions(
     Ok(())
 }
 
+
+trait Test: GetTypeRegistration {}
+
+// impl Test for smol_str::SmolStr {}
+
 pub fn register_script_type_registration_functions(
     registry: &mut World,
 ) -> Result<(), FunctionRegistrationError> {

crates/languages/bevy_mod_scripting_rhai/Cargo.toml

@@ -17,6 +17,5 @@ path = "src/lib.rs"
 
 [dependencies]
 bevy = { workspace = true, default-features = false }
-rhai = { version = "1.16", features = ["sync"] }
+rhai = { version = "1.20.1", features = ["sync"] }
 bevy_mod_scripting_core = { workspace = true }
-anyhow = "1.0.75"

crates/languages/bevy_mod_scripting_rhai/src/assets.rs

@@ -157,195 +157,3 @@ pub fn with_world<F: FnOnce(&mut RhaiScriptContext) -> Result<(), ScriptError>>(
         f(context)
     })
 }
-// use crate::{
-//     assets::{RhaiFile, RhaiLoader},
-//     docs::RhaiDocFragment,
-// };
-// use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
-// use bevy_mod_scripting_core::{prelude::*, systems::*};
-// use rhai::*;
-// use std::marker::PhantomData;
-
-// pub mod assets;
-// pub mod docs;
-// pub use rhai;
-// pub mod prelude {
-//     pub use crate::{
-//         assets::{RhaiFile, RhaiLoader},
-//         docs::RhaiDocFragment,
-//         RhaiContext, RhaiEvent, RhaiScriptHost,
-//     };
-//     pub use rhai;
-//     pub use rhai::{RhaiRuntime, FuncArgs};
-// }
-
-// #[derive(Resource)]
-// pub struct RhaiScriptHost<A: FuncArgs + Send> {
-//     pub RhaiRuntime: RhaiRuntime,
-//     _ph: PhantomData<A>,
-// }
-
-// #[allow(deprecated)]
-// impl<A: FuncArgs + Send> Default for RhaiScriptHost<A> {
-//     fn default() -> Self {
-//         let mut e = RhaiRuntime::new();
-//         // prevent shadowing of `state`,`world` and `entity` in variable in scripts
-//         e.on_def_var(|_, info, _| {
-//             Ok(info.name() != "state" && info.name() != "world" && info.name() != "entity")
-//         });
-
-//         Self {
-//             RhaiRuntime: e,
-//             _ph: Default::default(),
-//         }
-//     }
-// }
-
-// pub struct RhaiContext {
-//     pub ast: AST,
-//     pub scope: Scope<'static>,
-// }
-
-// #[derive(Clone, Event)]
-// /// A Rhai Hook. The result of creating this event will be
-// /// a call to the lua script with the hook_name and the given arguments
-// pub struct RhaiEvent<A: FuncArgs + Clone + 'static> {
-//     pub hook_name: String,
-//     pub args: A,
-//     pub recipients: Recipients,
-// }
-
-// impl<A: FuncArgs + Clone + Send + Sync + 'static> ScriptEvent for RhaiEvent<A> {
-//     fn recipients(&self) -> &crate::Recipients {
-//         &self.recipients
-//     }
-// }
-
-// impl<A: FuncArgs + Send + Clone + Sync + 'static> ScriptHost for RhaiScriptHost<A> {
-//     type ScriptContext = RhaiContext;
-//     type ScriptEvent = RhaiEvent<A>;
-//     type ScriptAsset = RhaiFile;
-//     type APITarget = RhaiRuntime;
-//     type DocTarget = RhaiDocFragment;
-
-//     fn register_with_app_in_set(
-//         app: &mut bevy::prelude::App,
-//         schedule: impl ScheduleLabel,
-//         set: impl SystemSet,
-//     ) {
-//         app.add_priority_event::<Self::ScriptEvent>()
-//             .init_asset::<RhaiFile>()
-//             .init_asset_loader::<RhaiLoader>()
-//             .init_resource::<CachedScriptState<Self>>()
-//             .init_resource::<ScriptContexts<Self::ScriptContext>>()
-//             .init_resource::<APIProviders<Self>>()
-//             .register_type::<ScriptCollection<Self::ScriptAsset>>()
-//             .register_type::<Script<Self::ScriptAsset>>()
-//             .register_type::<Handle<RhaiFile>>()
-//             .add_systems(
-//                 schedule,
-//                 (
-//                     script_add_synchronizer::<Self>,
-//                     script_remove_synchronizer::<Self>,
-//                     script_hot_reload_handler::<Self>,
-//                 )
-//                     .chain()
-//                     .in_set(set),
-//             )
-//             // setup RhaiRuntime
-//             .add_systems(
-//                 Startup,
-//                 |mut providers: ResMut<APIProviders<Self>>, mut host: ResMut<Self>| {
-//                     providers
-//                         .attach_all(&mut host.RhaiRuntime)
-//                         .expect("Error in adding api's for rhai");
-//                 },
-//             );
-//     }
-
-//     fn setup_script(
-//         &mut self,
-//         script_data: &ScriptData,
-//         ctx: &mut Self::ScriptContext,
-//         providers: &mut APIProviders<Self>,
-//     ) -> Result<(), ScriptError> {
-//         providers.setup_all(script_data, ctx)
-//     }
-
-//     fn load_script(
-//         &mut self,
-//         script: &[u8],
-//         script_data: &ScriptData,
-//         _: &mut APIProviders<Self>,
-//     ) -> Result<Self::ScriptContext, ScriptError> {
-//         let mut scope = Scope::new();
-//         let mut ast = self
-//             .RhaiRuntime
-//             .compile(
-//                 std::str::from_utf8(script).map_err(|e| ScriptError::FailedToLoad {
-//                     script: script_data.name.to_owned(),
-//                     msg: e.to_string(),
-//                 })?,
-//             )
-//             .map_err(|e| ScriptError::SyntaxError {
-//                 script: script_data.name.to_owned(),
-//                 msg: e.to_string(),
-//             })?;
-
-//         ast.set_source(script_data.name);
-
-//         // persistent state for scripts
-//         scope.push("state", Map::new());
-
-//         Ok(RhaiContext { ast, scope })
-//     }
-
-//     fn handle_events<'a>(
-//         &mut self,
-//         world: &mut World,
-//         events: &[Self::ScriptEvent],
-//         ctxs: impl Iterator<Item = (ScriptData<'a>, &'a mut Self::ScriptContext)>,
-//         _providers: &mut APIProviders<Self>,
-//     ) {
-//         ctxs.for_each(|(fd, ctx)| {
-//             for event in events.iter() {
-//                 // check if this script should handle this event
-//                 if !event.recipients().is_recipient(&fd) {
-//                     continue;
-//                 };
-
-//                 match self.RhaiRuntime.call_fn(
-//                     &mut ctx.scope,
-//                     &ctx.ast,
-//                     &event.hook_name,
-//                     event.args.clone(),
-//                 ) {
-//                     Ok(v) => v,
-//                     Err(e) => {
-//                         let mut state: CachedScriptState<Self> = world.remove_resource().unwrap();
-
-//                         match *e {
-//                             EvalAltResult::ErrorFunctionNotFound(..) => {}
-//                             _ => {
-//                                 let (_, mut error_wrt, _) = state.event_state.get_mut(world);
-
-//                                 let error = ScriptError::RuntimeError {
-//                                     script: fd.name.to_string(),
-//                                     msg: e.to_string(),
-//                                 };
-//                                 error!("{}", error);
-//                                 error_wrt.send(ScriptErrorEvent { error });
-//                             }
-//                         }
-
-//                         world.insert_resource(state);
-//                     }
-//                 };
-//             }
-
-//             // executing this at the end here means we execute global statements exactly once
-//             // all this method call does is set a variable on the AST to NONE so should not affect performance
-//             ctx.ast.clear_statements();
-//         });
-//     }
-// }