mirrors/gauntlet
1
0
Fork 0
mirror of https://github.com/project-gauntlet/gauntlet.git synced 2025-12-23 10:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unstable ordering of shared types in component model, leftovers

Browse source
This commit is contained in:
Exidex 2024-04-16 20:45:10 +02:00
parent 61254fe1b3
commit b682011b5d
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -7346,6 +7346,7 @@ dependencies = [
"directories",
"gix",
"include_dir",
"indexmap 2.2.6",
"numbat",
"once_cell",
"open",

1
rust/server/Cargo.toml
View file

@ -24,6 +24,7 @@ sqlx = { version = "0.7", features = [ "runtime-tokio", "json", "sqlite" ] }
common = { path = "../common" }
utils = { path = "../utils" }
component_model = { path = "../component_model" }
indexmap = { version = "2.1.0", features = ["serde"] }
tonic = "0.11.0"
client = { path = "../client" }
walkdir = "2.4.0"

9
rust/server/src/plugins/js.rs
View file

@ -15,6 +15,7 @@ use deno_runtime::deno_core::ModuleSpecifier;
use deno_runtime::permissions::{Permissions, PermissionsContainer, PermissionsOptions};
use deno_runtime::worker::MainWorker;
use deno_runtime::worker::WorkerOptions;
use indexmap::IndexMap;
use numbat::InterpreterResult;
use numbat::markup::Formatter;
use numbat::module_importer::BuiltinModuleImporter;
@ -1245,7 +1246,7 @@ fn from_intermediate_to_js_event(event: IntermediateUiEvent) -> JsUiEvent {
}
}
fn from_js_to_intermediate_widget(scope: &mut v8::HandleScope, ui_widget: JsUiWidget, component_model: &ComponentModel, shared_types: &HashMap<String, SharedType>) -> anyhow::Result<IntermediateUiWidget> {
fn from_js_to_intermediate_widget(scope: &mut v8::HandleScope, ui_widget: JsUiWidget, component_model: &ComponentModel, shared_types: &IndexMap<String, SharedType>) -> anyhow::Result<IntermediateUiWidget> {
let children = ui_widget.widget_children.into_iter()
.map(|child| from_js_to_intermediate_widget(scope, child, component_model, shared_types))
.collect::<anyhow::Result<Vec<IntermediateUiWidget>>>()?;
@ -1280,7 +1281,7 @@ fn from_js_to_intermediate_properties(
scope: &mut v8::HandleScope,
v8_properties: HashMap<String, serde_v8::Value>,
component_props: &HashMap<&String, &PropertyType>,
shared_types: &HashMap<String, SharedType>
shared_types: &IndexMap<String, SharedType>
) -> anyhow::Result<HashMap<String, PropertyValue>> {
let vec = v8_properties.into_iter()
.filter(|(name, _)| name.as_str() != "children")
@ -1304,7 +1305,7 @@ fn convert(
property_type: &PropertyType,
name: String,
value: v8::Local<v8::Value>,
shared_types: &HashMap<String, SharedType>
shared_types: &IndexMap<String, SharedType>
) -> anyhow::Result<(String, PropertyValue)> {
match property_type {
PropertyType::String | PropertyType::Enum { .. } => {
@ -1400,7 +1401,7 @@ fn convert_bytes(scope: &mut v8::HandleScope, name: String, value: v8::Local<v8:
Ok((name, PropertyValue::Bytes(serde_v8::from_v8(scope, value)?)))
}
fn convert_object(scope: &mut v8::HandleScope, name: String, value: v8::Local<v8::Value>, object_name: &str, shared_types: &HashMap<String, SharedType>) -> anyhow::Result<(String, PropertyValue)> {
fn convert_object(scope: &mut v8::HandleScope, name: String, value: v8::Local<v8::Value>, object_name: &str, shared_types: &IndexMap<String, SharedType>) -> anyhow::Result<(String, PropertyValue)> {
let object: v8::Local<Object> = value.try_into().context(format!("error while reading property {}", name))?;
let props = object