cant solve feature flag issue

Cargo.toml

@@ -10,7 +10,6 @@ members = [
     "fastn-js",
     "fastn-lang",
     "fastn-package",
-    "fastn-resolved",
     "fastn-runtime",
     "fastn-update",
     "fastn-utils",
@@ -20,7 +19,7 @@ members = [
     "ftd-ast",
     "ftd-p1",
 ]
-exclude = ["fastn-wasm-runtime", "fastn-wasm", "integration-tests/wasm", "v0.5"]
+exclude = ["fastn-wasm-runtime", "fastn-wasm", "integration-tests/wasm", "v0.5", "fastn-resolved"]
 resolver = "2"
 
 [workspace.package]
@@ -87,14 +86,14 @@ enum-iterator-derive = "0.6"
 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 = { path = "fastn-resolved" }
 fastn-core.path = "fastn-core"
 fastn-issues.path = "fastn-issues"
 fastn-package.path = "fastn-package"
 fastn-utils.path = "fastn-utils"
 fastn-compiler = { path = "v0.5/fastn-compiler", features = ["owned-tdoc"] }
 fastn-unresolved.path = "v0.5/fastn-unresolved"
-fastn-runtime.path = "fastn-runtime"
+fastn-runtime = { path = "fastn-runtime", features = ["owned-tdoc"] }
 fbt-lib.path = "fbt_lib"
 fastn-expr.path = "fastn-expr"
 format_num = "0.1"

fastn-core/Cargo.toml

@@ -58,6 +58,7 @@ url.workspace = true
 zip.workspace = true
 fastn-expr.workspace = true
 fastn-resolved.workspace = true
+fastn-runtime.workspace = true
 
 [dev-dependencies]
 fbt-lib.workspace = true

fastn-core/src/package/package_doc.rs

@@ -393,12 +393,25 @@ pub(crate) async fn read_ftd_(
             )
             .await
         }
-        fastn_core::FTDEdition::FTD2024 => {
-            todo!()
-        }
+        fastn_core::FTDEdition::FTD2024 => read_ftd_2024(config).await,
     }
 }
 
+async fn read_ftd_2024(_config: &mut fastn_core::RequestConfig) -> fastn_core::Result<FTDResult> {
+    Ok(FTDResult::Html(
+        fastn_runtime::render_2024_document(
+            // Box::new(&mut config.config.ds),
+            todo!(),
+            Default::default(),
+            "index.ftd",
+            serde_json::Value::Null,
+            false,
+        )
+        .await
+        .into_bytes(),
+    ))
+}
+
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
 pub(crate) async fn read_ftd_2022(
     config: &mut fastn_core::RequestConfig,

fastn-ds/src/symbols.rs

@@ -35,7 +35,7 @@ impl fastn_ds::DocumentStore {
 }
 
 #[async_trait::async_trait]
-impl fastn_compiler::SymbolStore for fastn_ds::DocumentStore {
+impl fastn_compiler::SymbolStore for &mut fastn_ds::DocumentStore {
     async fn lookup(
         &mut self,
         arena: &mut fastn_unresolved::Arena,

fastn-resolved/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "fastn-resolved"
 version = "0.1.1"
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
+#authors.workspace = true
+edition = "2021"
+#description.workspace = true
 license = "BSD-3-Clause"
-repository.workspace = true
-homepage.workspace = true
+#repository.workspace = true
+#homepage.workspace = true
 
 [features]
 owned-tdoc = []
 
 [dependencies]
-serde.workspace = true
-indexmap.workspace = true
+serde = "1"
+indexmap = "2"
 

fastn-runtime/Cargo.toml

@@ -9,8 +9,7 @@ repository.workspace = true
 homepage.workspace = true
 
 [features]
-owned-tdoc = ["fastn-resolved/owned-tdoc"]
-default = ["owned-tdoc"]
+owned-tdoc = ["fastn-resolved/owned-tdoc", "fastn-compiler/owned-tdoc"]
 
 [dependencies]
 fastn-js.workspace = true
@@ -22,3 +21,6 @@ serde.workspace = true
 once_cell.workspace = true
 sha2.workspace = true
 indexmap.workspace = true
+fastn-compiler.workspace = true
+fastn-unresolved.workspace = true
+serde_json.workspace = true

fastn-runtime/src/lib.rs

@@ -443,3 +443,21 @@ pub(crate) fn external_css_files(
     // go through needed_symbols and get the external css files
     todo!()
 }
+
+pub async fn render_2024_document(
+    symbols: Box<dyn fastn_compiler::SymbolStore + Send>,
+    global_aliases: fastn_unresolved::AliasesSimple,
+    path: &str,
+    _data: serde_json::Value,
+    _strict: bool,
+) -> String {
+    let source = std::fs::File::open(path)
+        .and_then(std::io::read_to_string)
+        .unwrap();
+    let o = fastn_compiler::compile(symbols, &source, "main", None, global_aliases)
+        .await
+        .unwrap();
+
+    let h = fastn_runtime::HtmlData::from_cd(o);
+    h.to_test_html()
+}

t/.fastn/config.json

@@ -0,0 +1,4 @@
+{
+  "package": "foo",
+  "all_packages": {}
+}

t/FASTN.ftd

@@ -0,0 +1,2 @@
+-- import: fastn
+-- fastn.package: foo

t/index.ftd

@@ -0,0 +1 @@
+-- ftd#text: hello world

v0.5/Cargo.toml

@@ -39,7 +39,7 @@ homepage = "https://fastn.com"
 
 arcstr = "1"
 async-trait = "0.1"
-fastn-compiler = { path = "fastn-compiler" }
+fastn-compiler = { path = "fastn-compiler", default-features = false }
 fastn-core = { path = "fastn-core" }
 fastn-section = { path = "fastn-section" }
 fastn-resolved = { path = "../fastn-resolved", default-features = false }

v0.5/fastn-compiler/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 homepage.workspace = true
 
 [features]
-owned-tdoc = []
+owned-tdoc = ["fastn-resolved/owned-tdoc"]
 
 [dependencies]
 async-trait.workspace = true

v0.5/fastn/src/commands/render.rs

@@ -3,7 +3,8 @@ impl fastn::commands::Render {
         let route = config.resolve(self.path.as_str()).await;
         match route {
             fastn_core::Route::Document(path, data) => {
-                let html = render_document(
+                let html = fastn_runtime::render_2024_document(
+                    Box::new(fastn::Symbols {}),
                     config.auto_imports.clone(),
                     path.as_str(),
                     data,
@@ -16,26 +17,3 @@ impl fastn::commands::Render {
         };
     }
 }
-
-pub(crate) async fn render_document(
-    global_aliases: fastn_unresolved::AliasesSimple,
-    path: &str,
-    _data: serde_json::Value,
-    _strict: bool,
-) -> String {
-    let source = std::fs::File::open(path)
-        .and_then(std::io::read_to_string)
-        .unwrap();
-    let o = fastn_compiler::compile(
-        Box::new(fastn::Symbols {}),
-        &source,
-        "main",
-        None,
-        global_aliases,
-    )
-    .await
-    .unwrap();
-
-    let h = fastn_runtime::HtmlData::from_cd(o);
-    h.to_test_html()
-}