Moved resolver to fastn_resolved_to_js

Cargo.toml

@@ -11,6 +11,7 @@ members = [
     "fastn-lang",
     "fastn-package",
     "fastn-resolved",
+    "fastn-resolved-to-js",
     "fastn-update",
     "fastn-utils",
     "fbt",
@@ -92,6 +93,7 @@ fastn-ds.path = "fastn-ds"
 fastn-update.path = "fastn-update"
 fastn-builtins.path = "fastn-builtins"
 fastn-resolved = { path = "fastn-resolved", version = "0.1.0" }
+fastn-resolved-to-js.path = "fastn-resolved-to-js"
 fastn-core.path = "fastn-core"
 fastn-issues.path = "fastn-issues"
 fastn-package.path = "fastn-package"

fastn-resolved-to-js/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "fastn-resolved-to-js"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+description.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+
+[dependencies]
+fastn-js.workspace = true

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

@@ -0,0 +1,4 @@
+extern crate self as fastn_resolved_to_js;
+
+mod resolver;
+pub use resolver::ResolverData;

ftd/src/js/resolver.rs → fastn-resolved-to-js/src/resolver.rs

@@ -11,7 +11,7 @@ pub struct ResolverData<'a> {
 }
 
 impl<'a> ResolverData<'a> {
-    pub(crate) fn none() -> ResolverData<'a> {
+    pub fn none() -> ResolverData<'a> {
         ResolverData {
             component_definition_name: &None,
             record_definition_name: &None,
@@ -24,15 +24,15 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn new_with_component_definition_name(
+    pub fn new_with_component_definition_name(
         component_definition_name: &'a Option<String>,
     ) -> ResolverData<'a> {
         let mut rdata = ResolverData::none();
         rdata.component_definition_name = component_definition_name;
         rdata
     }
 
-    pub(crate) fn clone_with_default_inherited_variable(&self) -> ResolverData<'a> {
+    pub fn clone_with_default_inherited_variable(&self) -> ResolverData<'a> {
         ResolverData {
             component_definition_name: self.component_definition_name,
             record_definition_name: self.record_definition_name,
@@ -45,7 +45,7 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn clone_with_new_inherited_variable(
+    pub fn clone_with_new_inherited_variable(
         &self,
         inherited_variable_name: &'a str,
     ) -> ResolverData<'a> {
@@ -61,7 +61,7 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn clone_with_new_component_name(
+    pub fn clone_with_new_component_name(
         &self,
         component_name: Option<String>,
     ) -> ResolverData<'a> {
@@ -77,7 +77,7 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn clone_with_new_device(
+    pub fn clone_with_new_device(
         &self,
         device: &'a Option<fastn_js::DeviceType>,
     ) -> ResolverData<'a> {
@@ -93,7 +93,7 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn clone_with_new_loop_alias(
+    pub fn clone_with_new_loop_alias(
         &self,
         loop_alias: &'a Option<String>,
         loop_counter_alias: &'a Option<String>,
@@ -111,7 +111,7 @@ impl<'a> ResolverData<'a> {
         }
     }
 
-    pub(crate) fn clone_with_new_record_definition_name(
+    pub fn clone_with_new_record_definition_name(
         &self,
         record_definition_name: &'a Option<String>,
     ) -> ResolverData<'a> {

fastn-resolved/src/lib.rs

@@ -8,11 +8,11 @@ mod component;
 pub mod evalexpr;
 mod expression;
 mod function;
-pub mod js;
 mod kind;
 mod module_thing;
 mod or_type;
 mod record;
+pub mod tdoc;
 mod value;
 mod variable;
 mod web_component;

ftd/Cargo.toml

@@ -41,6 +41,7 @@ fastn-js.workspace = true
 indexmap.workspace = true
 fastn-resolved.workspace = true
 fastn-builtins.workspace = true
+fastn-resolved-to-js.workspace = true
 
 [dev-dependencies]
 diffy.workspace = true

ftd/src/interpreter/tdoc.rs

@@ -2217,7 +2217,7 @@ impl<'a> TDoc<'a> {
     }
 }
 
-impl<'a> fastn_resolved::js::TDoc for TDoc<'a> {
+impl<'a> fastn_resolved::tdoc::TDoc for TDoc<'a> {
     fn get_opt_function(&self, name: &str, line_number: usize) -> Option<Function> {
         let initial_thing = self.get_initial_thing(name, line_number).ok()?.0;
         initial_thing.function(self.name, line_number).ok()