tdoc trait has two versions now

fastn-resolved-to-js/Cargo.toml

@@ -8,6 +8,9 @@ license.workspace = true
 repository.workspace = true
 homepage.workspace = true
 
+[features]
+owned-tdoc = ["fastn-resolved/owned-tdoc"]
+
 [dependencies]
 fastn-js.workspace = true
 fastn-resolved.workspace = true

fastn-resolved-to-js/src/utils.rs

@@ -278,10 +278,10 @@ pub(crate) fn get_set_property_values_for_provided_component_properties(
 
     // Attempt to retrieve component or web component arguments
     doc.get_opt_component(component_name)
-        .map(|v| &v.arguments)
+        .map(|v| v.arguments.clone())
         .or(doc
             .get_opt_web_component(component_name)
-            .map(|v| &v.arguments))
+            .map(|v| v.arguments.clone()))
         .map(|arguments| {
             // Collect valid arguments matching the provided properties and their set property values
             arguments

fastn-resolved/Cargo.toml

@@ -8,5 +8,9 @@ license = "BSD-3-Clause"
 repository.workspace = true
 homepage.workspace = true
 
+[features]
+owned-tdoc = []
+
 [dependencies]
 serde.workspace = true
+

fastn-resolved/src/tdoc.rs

@@ -1,3 +1,13 @@
+#[cfg(feature = "owned-tdoc")]
+pub trait TDoc {
+    fn get_opt_function(&self, name: &str) -> Option<fastn_resolved::Function>;
+    fn get_opt_record(&self, name: &str) -> Option<fastn_resolved::Record>;
+    fn name(&self) -> &str;
+    fn get_opt_component(&self, name: &str) -> Option<fastn_resolved::ComponentDefinition>;
+    fn get_opt_web_component(&self, name: &str) -> Option<fastn_resolved::WebComponentDefinition>;
+}
+
+#[cfg(not(feature = "owned-tdoc"))]
 pub trait TDoc {
     fn get_opt_function(&self, name: &str) -> Option<&fastn_resolved::Function>;
     fn get_opt_record(&self, name: &str) -> Option<&fastn_resolved::Record>;

ftd/Cargo.toml

@@ -39,7 +39,7 @@ thiserror.workspace = true
 tracing.workspace = true
 fastn-js.workspace = true
 indexmap.workspace = true
-fastn-resolved.workspace = true
+fastn-resolved = { workspace = true, features = ["owned-tdoc"] }
 fastn-builtins.workspace = true
 fastn-resolved-to-js.workspace = true
 

ftd/src/html/functions.rs

@@ -15,7 +15,7 @@ impl FunctionGenerator {
         for function in node_data
             .bag
             .values()
-            .filter_map(|v| v.function(node_data.name.as_str(), 0).ok().cloned())
+            .filter_map(|v| v.function(node_data.name.as_str(), 0).ok().clone())
         {
             vector.push(self.get_function(function)?)
         }

ftd/src/interpreter/tdoc.rs

@@ -1031,7 +1031,7 @@ impl<'a> TDoc<'a> {
         line_number: usize,
     ) -> ftd::interpreter::Result<fastn_resolved::Function> {
         let initial_thing = self.get_initial_thing(name, line_number)?.0;
-        initial_thing.function(self.name, line_number).cloned()
+        Ok(initial_thing.function(self.name, line_number)?.clone())
     }
 
     pub fn search_function(
@@ -2213,27 +2213,27 @@ impl<'a> TDoc<'a> {
 }
 
 impl<'a> fastn_resolved::tdoc::TDoc for TDoc<'a> {
-    fn get_opt_function(&self, name: &str) -> Option<&Function> {
+    fn get_opt_function(&self, name: &str) -> Option<Function> {
         let initial_thing = self.get_reexport_thing(name, 0).ok()?.0;
-        initial_thing.function(self.name, 0).ok()
+        initial_thing.function(self.name, 0).ok().clone()
     }
 
-    fn get_opt_record(&self, name: &str) -> Option<&Record> {
+    fn get_opt_record(&self, name: &str) -> Option<Record> {
         let initial_thing = self.get_reexport_thing(name, 0).ok()?.0;
-        initial_thing.record(self.name, 0).ok()
+        initial_thing.record(self.name, 0).ok().clone()
     }
 
     fn name(&self) -> &str {
         self.name
     }
 
-    fn get_opt_component(&self, name: &str) -> Option<&ComponentDefinition> {
+    fn get_opt_component(&self, name: &str) -> Option<ComponentDefinition> {
         let initial_thing = self.get_reexport_thing(name, 0).ok()?.0;
-        initial_thing.component_ref()
+        initial_thing.clone().component()
     }
 
-    fn get_opt_web_component(&self, name: &str) -> Option<&fastn_resolved::WebComponentDefinition> {
+    fn get_opt_web_component(&self, name: &str) -> Option<fastn_resolved::WebComponentDefinition> {
         let initial_thing = self.get_reexport_thing(name, 0).ok()?.0;
-        initial_thing.web_component(self.name, 0).ok()
+        initial_thing.web_component(self.name, 0).ok().clone()
     }
 }

ftd/src/interpreter/things/mod.rs

@@ -20,17 +20,17 @@ pub trait ThingExt {
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::Record>;
+    ) -> ftd::interpreter::Result<fastn_resolved::Record>;
     fn web_component(
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::WebComponentDefinition>;
+    ) -> ftd::interpreter::Result<fastn_resolved::WebComponentDefinition>;
     fn function(
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::Function>;
+    ) -> ftd::interpreter::Result<fastn_resolved::Function>;
 }
 
 impl ThingExt for Thing {
@@ -53,9 +53,9 @@ impl ThingExt for Thing {
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::Record> {
+    ) -> ftd::interpreter::Result<fastn_resolved::Record> {
         match self {
-            ftd::interpreter::Thing::Record(v) => Ok(v),
+            ftd::interpreter::Thing::Record(v) => Ok(v.clone()),
             t => ftd::interpreter::utils::e2(
                 format!("Expected Record, found: `{:?}`", t),
                 doc_id,
@@ -68,9 +68,9 @@ impl ThingExt for Thing {
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::WebComponentDefinition> {
+    ) -> ftd::interpreter::Result<fastn_resolved::WebComponentDefinition> {
         match self {
-            ftd::interpreter::Thing::WebComponent(v) => Ok(v),
+            ftd::interpreter::Thing::WebComponent(v) => Ok(v.to_owned()),
             t => ftd::interpreter::utils::e2(
                 format!("Expected WebComponent, found: `{:?}`", t),
                 doc_id,
@@ -83,9 +83,9 @@ impl ThingExt for Thing {
         &self,
         doc_id: &str,
         line_number: usize,
-    ) -> ftd::interpreter::Result<&fastn_resolved::Function> {
+    ) -> ftd::interpreter::Result<fastn_resolved::Function> {
         match self {
-            ftd::interpreter::Thing::Function(v) => Ok(v),
+            ftd::interpreter::Thing::Function(v) => Ok(v.to_owned()),
             t => ftd::interpreter::utils::e2(
                 format!("Expected Function, found: `{:?}`", t),
                 doc_id,