minor refactor

fastn-resolved/src/lib.rs

@@ -34,6 +34,16 @@ pub type Map<T> = std::collections::BTreeMap<String, T>;
 
 #[derive(Debug, Clone, PartialEq, serde::Deserialize, serde::Serialize)]
 pub enum Definition {
+    SymbolAlias {
+        symbol: String,
+        alias: String,
+        line_number: usize,
+    },
+    ModuleAlias {
+        module: String,
+        alias: String,
+        line_number: usize,
+    },
     Record(fastn_resolved::Record),
     OrType(fastn_resolved::OrType),
     OrTypeWithVariant {
@@ -63,6 +73,9 @@ impl Definition {
             fastn_resolved::Definition::Function(f) => f.name.to_string(),
             fastn_resolved::Definition::WebComponent(w) => w.name.to_string(),
             fastn_resolved::Definition::Export { to, .. } => to.to_string(),
+            // TODO: check if the following two are valid
+            Definition::SymbolAlias { alias, .. } => alias.to_string(),
+            Definition::ModuleAlias { alias, .. } => alias.to_string(),
         }
     }
 
@@ -76,6 +89,8 @@ impl Definition {
             Definition::OrTypeWithVariant { variant, .. } => variant.line_number(),
             Definition::WebComponent(w) => w.line_number,
             Definition::Export { line_number, .. } => *line_number,
+            Definition::SymbolAlias { line_number, .. } => *line_number,
+            Definition::ModuleAlias { line_number, .. } => *line_number,
         }
     }
 

fastn-runtime/src/main.rs

@@ -23,5 +23,5 @@ fn main() {
 
     std::fs::write(std::path::PathBuf::from("output.html"), h.to_test_html()).unwrap();
 
-    // this main should create a HTML file, and store it in current folder as index.html etc.
+    // this main should create an HTML file, and store it in the current folder as index.html etc.
 }

v0.5/fastn-core/src/config/read.rs

@@ -2,7 +2,23 @@ impl fastn_core::Config {
     pub async fn read(_fastn_ftd: fastn_section::Document) -> Result<Self, ReadError> {
         Ok(fastn_core::Config {
             sitemap: fastn_core::Sitemap {},
-            auto_imports: vec![],
+            auto_imports: vec![
+                // fastn_unresolved::UR::UnResolved(
+                //     fastn_unresolved::Definition {
+                //         // symbol requires us to know the module, which we do not know right now, so
+                //         // we add empty values here, only the name.
+                //         symbol: Some(fastn_unresolved::Symbol::new()),
+                //         doc: None,
+                //         name: fastn_unresolved::UR::UnResolved(fastn_section::Identifier::new(
+                //             "ftd".to_string(),
+                //         )),
+                //         visibility: fastn_section::Visibility::Public,
+                //         inner: fastn_unresolved::InnerDefinition::ModuleAlias(
+                //             fastn_unresolved::Module::new("ftd", ""),
+                //         ),
+                //     },
+                // )
+            ],
             redirects: vec![],
             dynamic_routes: vec![],
         })

v0.5/fastn-unresolved/src/lib.rs

@@ -67,7 +67,7 @@ pub struct Definition {
 #[derive(Debug, Clone)]
 pub enum InnerDefinition {
     SymbolAlias(fastn_unresolved::Symbol),
-    ModuleAlias(fastn_unresolved::Symbol),
+    ModuleAlias(fastn_unresolved::Module),
     Component {
         arguments: Vec<UR<Argument, fastn_resolved::Argument>>,
         body: Vec<URCI>,

v0.5/fastn-unresolved/src/resolver/symbol.rs

@@ -7,6 +7,7 @@
 /// with the innermost block as the last entry.
 pub fn resolve(
     _module: &fastn_unresolved::Module,
+    // parent: Option<fastn_unresolved::Symbol>,
     name: &mut fastn_unresolved::URIS,
     _definitions: &std::collections::HashMap<fastn_unresolved::Symbol, fastn_unresolved::URD>,
     interner: &mut string_interner::DefaultStringInterner,

v0.5/fastn/index.ftd

@@ -1 +1,2 @@
+-- ftd#text: hello
 -- ftd.text: hello