defs need indexmap for insertion ordering

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src-tauri/Cargo.lock

@@ -41,6 +41,7 @@ rustpython-vm = "0.4.0"
 async-recursion = "1.1.1"
 tokio-stream = "0.1.17"
 tokio = { version = "1.44.1", features = ["io-std"] }
+indexmap = { version = "2.9.0", features = ["serde"] }
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-cli = "2"

pdl-live-react/src-tauri/Cargo.toml

@@ -237,8 +237,8 @@ fn json_loads(
     outer_name: &str,
     inner_name: &str,
     value: &str,
-) -> Option<HashMap<String, PdlBlock>> {
-    let mut m = HashMap::new();
+) -> Option<indexmap::IndexMap<String, PdlBlock>> {
+    let mut m = indexmap::IndexMap::new();
     m.insert(
         outer_name.to_owned(),
         PdlBlock::Text(
@@ -505,7 +505,7 @@ asyncio.run(invoke())
                 }
 
                 let closure_name = format!("agent_closure_{}", agent_name);
-                let mut defs = HashMap::new();
+                let mut defs = indexmap::IndexMap::new();
                 defs.insert(
                     closure_name.clone(),
                     PdlBlock::Function(FunctionBlock {
@@ -544,7 +544,7 @@ asyncio.run(invoke())
         defs: if tool_declarations.len() == 0 {
             None
         } else {
-            let mut m = HashMap::new();
+            let mut m = indexmap::IndexMap::new();
             m.insert(
                 "pdl__tools".to_string(),
                 PdlBlock::Object(ObjectBlock {

pdl-live-react/src-tauri/src/compile/beeai.rs

@@ -1,4 +1,5 @@
 use ::std::collections::HashMap;
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::{to_string, Number, Value};
 
@@ -61,7 +62,7 @@ pub struct CallBlock {
     pub args: Option<Value>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defs: Option<HashMap<String, PdlBlock>>,
+    pub defs: Option<IndexMap<String, PdlBlock>>,
 }
 
 impl CallBlock {
@@ -79,7 +80,7 @@ pub trait SequencingBlock {
     fn description(&self) -> &Option<String>;
     fn role(&self) -> &Option<Role>;
     fn def(&self) -> &Option<String>;
-    fn defs(&self) -> &Option<HashMap<String, PdlBlock>>;
+    fn defs(&self) -> &Option<IndexMap<String, PdlBlock>>;
     fn items(&self) -> &Vec<PdlBlock>;
     fn with_items(&self, items: Vec<PdlBlock>) -> Self;
     fn parser(&self) -> &Option<PdlParser>;
@@ -102,7 +103,7 @@ pub struct LastOfBlock {
     pub role: Option<Role>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defs: Option<HashMap<String, PdlBlock>>,
+    pub defs: Option<IndexMap<String, PdlBlock>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parser: Option<PdlParser>,
@@ -123,7 +124,7 @@ impl SequencingBlock for LastOfBlock {
     fn def(&self) -> &Option<String> {
         return &self.def;
     }
-    fn defs(&self) -> &Option<HashMap<String, PdlBlock>> {
+    fn defs(&self) -> &Option<IndexMap<String, PdlBlock>> {
         &self.defs
     }
     fn items(&self) -> &Vec<PdlBlock> {
@@ -168,7 +169,7 @@ pub struct TextBlock {
     pub role: Option<Role>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defs: Option<HashMap<String, PdlBlock>>,
+    pub defs: Option<IndexMap<String, PdlBlock>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parser: Option<PdlParser>,
@@ -189,7 +190,7 @@ impl SequencingBlock for TextBlock {
     fn def(&self) -> &Option<String> {
         return &self.def;
     }
-    fn defs(&self) -> &Option<HashMap<String, PdlBlock>> {
+    fn defs(&self) -> &Option<IndexMap<String, PdlBlock>> {
         &self.defs
     }
     fn items(&self) -> &Vec<PdlBlock> {
@@ -506,7 +507,7 @@ pub struct IfBlock {
     pub else_: Option<Box<PdlBlock>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defs: Option<HashMap<String, PdlBlock>>,
+    pub defs: Option<IndexMap<String, PdlBlock>>,
 }
 
 /// Return the array of values computed by each block of the list of blocks

pdl-live-react/src-tauri/src/pdl/ast.rs

@@ -711,7 +711,7 @@ impl<'a> Interpreter<'a> {
 
     async fn process_defs(
         &mut self,
-        defs: &Option<HashMap<String, PdlBlock>>,
+        defs: &Option<indexmap::IndexMap<String, PdlBlock>>,
     ) -> Result<(), PdlError> {
         let mut new_scope: Scope = HashMap::new();
         if let Some(cur_scope) = self.scope.last() {