v0.8.28

Author: cj-formata

Cargo.lock

@@ -126,4 +126,4 @@ keywords = ["schema", "interpreter", "async", "validation", "embedded"]
 license = "Apache-2.0"
 name = "stof"
 repository = "https://github.com/dev-formata-io/stof"
-version = "0.8.27"
+version = "0.8.28"

Cargo.toml

@@ -213,7 +213,7 @@ github: {
 /// Generate Cargo.toml file.
 /// `stof run project.stof -a cargo`
 async fn generate_cargo_toml() {
-    const out = await Rust.Cargo.generate(self.cargo, 0.8.27, update = false);
+    const out = await Rust.Cargo.generate(self.cargo, 0.8.28, update = false);
     fs.write('Cargo.toml', out);
     pln('Cargo .. ok');
 }

project.stof

@@ -170,43 +170,45 @@ impl Field {
                 }
             }
 
-            // Look for a parent with the field name (that is also a field)
-            let mut gp = None;
-            if let Some(parent) = &node.parent {
-                if let Some(parent) = parent.node(&graph) {
-                    if (parent.name.as_ref() == field_name || field_name == SUPER_KEYWORD.as_ref()) && parent.is_field() {
-                        if let Some(grand) = &parent.parent {
-                            if grand.node_exists(&graph) {
-                                gp = Some((grand.clone(), parent.name.clone()));
+            if created.is_none() {
+                // Look for a parent with the field name (that is also a field)
+                let mut gp = None;
+                if let Some(parent) = &node.parent {
+                    if let Some(parent) = parent.node(&graph) {
+                        if (parent.name.as_ref() == field_name || field_name == SUPER_KEYWORD.as_ref()) && parent.is_field() {
+                            if let Some(grand) = &parent.parent {
+                                if grand.node_exists(&graph) {
+                                    gp = Some((grand.clone(), parent.name.clone()));
+                                }
                             }
                         }
                     }
                 }
-            }
-            if let Some((gp, field_name)) = gp {
-                return Self::field(graph, &gp, field_name.as_ref());
-            }
+                if let Some((gp, field_name)) = gp {
+                    return Self::field(graph, &gp, field_name.as_ref());
+                }
 
-            // Is this node the thing?
-            if (node.name.as_ref() == field_name || field_name == SELF_KEYWORD.as_ref()) && node.is_field() {
-                if let Some(parent) = &node.parent {
-                    if parent.node_exists(graph) {
-                        self_parent = Some(parent.clone());
-                        self_name = Some(node.name.clone());
+                // Is this node the thing?
+                if (node.name.as_ref() == field_name || field_name == SELF_KEYWORD.as_ref()) && node.is_field() {
+                    if let Some(parent) = &node.parent {
+                        if parent.node_exists(graph) {
+                            self_parent = Some(parent.clone());
+                            self_name = Some(node.name.clone());
+                        }
                     }
                 }
             }
         }
-        if let Some(parent) = self_parent {
-            if let Some(name) = self_name {
-                return Self::field(graph, &parent, name.as_ref());
-            }
-        }
         if let Some(field) = created {
             if let Some(dref) = graph.insert_stof_data(node, field_name, Box::new(field), None) {
                 return Some(dref);
             }
         }
+        if let Some(parent) = self_parent {
+            if let Some(name) = self_name {
+                return Self::field(graph, &parent, name.as_ref());
+            }
+        }
         None
     }