From b39209d404f9c34dde81ef892e5ea96d3467b9f0 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Fri, 27 Oct 2023 21:57:32 +0530
Subject: [PATCH 01/32] attaching tutor.js

---
 fastn-core/src/commands/serve.rs |  1 +
 fastn-core/src/tutor.rs          | 10 ++++++++++
 fastn-core/src/utils.rs          | 10 ++++++++++
 fastn-core/tutor.js              | 19 +++++++++++++++++++
 fastn/src/main.rs                |  2 +-
 ftd/ftd-js.html                  |  2 ++
 6 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 fastn-core/tutor.js

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 0bbf40fc35..5b1f966f29 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -657,6 +657,7 @@ async fn route(
         ("get", "/favicon.ico") => favicon().await,
         ("get", "/test/") => test().await,
         ("get", "/-/pwd/") => fastn_core::tutor::pwd().await,
+        ("get", "/-/tutor.js") => fastn_core::tutor::js().await,
         ("get", "/-/shutdown/") => fastn_core::tutor::shutdown().await,
         (_, _) => {
             serve(
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 65c3229a01..7fffe1ab06 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -6,6 +6,10 @@ pub async fn pwd() -> fastn_core::Result<fastn_core::http::Response> {
     fastn_core::http::api_ok(std::env::current_dir()?.to_string_lossy())
 }
 
+pub async fn js() -> fastn_core::Result<fastn_core::http::Response> {
+    Ok(actix_web::HttpResponse::Ok().body(include_bytes!("../tutor.js").to_vec()))
+}
+
 pub async fn shutdown() -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
@@ -148,7 +152,10 @@ struct Tutorial {
     url: String,
     title: String,
     done: bool,
+    /// current means this is the tutorial the user is currently working on
     current: bool,
+    /// active means this is the page the user is seeing right now
+    active: bool,
 }
 
 impl Tutorial {
@@ -165,6 +172,7 @@ impl Tutorial {
             current: state.current == id,
             url: format!("/{id}/"),
             id,
+            active: false,
         })
     }
 }
@@ -194,6 +202,7 @@ mod test {
                         title: "Install and start using `fastn`".to_string(),
                         done: false,
                         current: false,
+                        active: false,
                     }],
                 },
                 super::Workshop {
@@ -207,6 +216,7 @@ mod test {
                         title: "Install and start using `fastn`".to_string(),
                         done: false,
                         current: false,
+                        active: false,
                     }],
                 },
             ],
diff --git a/fastn-core/src/utils.rs b/fastn-core/src/utils.rs
index 2a237d35dc..e47792bb17 100644
--- a/fastn-core/src/utils.rs
+++ b/fastn-core/src/utils.rs
@@ -793,6 +793,16 @@ pub fn replace_markers_2023(
             )
             .as_str(),
         )
+        .replace(
+            "__extra_js__",
+            get_extra_js(
+                config.ftd_external_js.as_slice(),
+                config.ftd_inline_js.as_slice(),
+                "",
+                "",
+            )
+            .as_str(),
+        )
         .replace("__default_css__", default_css)
         .replace("__base_url__", base_url)
         .as_str(),
diff --git a/fastn-core/tutor.js b/fastn-core/tutor.js
new file mode 100644
index 0000000000..e6134faecb
--- /dev/null
+++ b/fastn-core/tutor.js
@@ -0,0 +1,19 @@
+(function() {
+    document.addEventListener("DOMContentLoaded", function() {
+        console.log("onload 1");
+
+        let iframe = document.createElement('iframe');
+        // iframe.src = "/-/tutor/";
+        iframe.src = "https://fastn.com/";
+        iframe.style.position = "fixed";
+        iframe.style.top = "0";
+        iframe.style.left = "0";
+        iframe.style.width = "100px";
+        iframe.style.height = "100vh";
+
+        document.body.style.paddingLeft = "100px";
+        document.body.insertBefore(iframe, document.body.firstChild);
+        console.log("onload");
+    });
+    console.log("registered");
+})();
\ No newline at end of file
diff --git a/fastn/src/main.rs b/fastn/src/main.rs
index ffc73481d8..32eabbda00 100644
--- a/fastn/src/main.rs
+++ b/fastn/src/main.rs
@@ -94,7 +94,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
             Some(2000),
             None,
             Some("2023".to_string()),
-            vec![],
+            vec!["/-/tutor.js".to_string()],
             vec![],
             vec![],
             vec![],
diff --git a/ftd/ftd-js.html b/ftd/ftd-js.html
index 8113699d14..62934ad4c0 100644
--- a/ftd/ftd-js.html
+++ b/ftd/ftd-js.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
@@ -10,6 +11,7 @@
     </script>
 
     __script_file__
+    __extra_js__
 
     <style>
        __default_css__

From 9f57a65a8c21848f13e0798d0ef1ff53b9fafbb9 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 30 Oct 2023 13:40:03 +0530
Subject: [PATCH 02/32] workshop data has to be in another folder, .tutor

---
 fastn-core/src/doc.rs                         |   2 +
 fastn-core/src/lib.rs                         |   2 +-
 fastn-core/src/library2022/mod.rs             |   1 +
 fastn-core/src/tutor.rs                       | 228 +++---------------
 .../one/a-website/01-hello-world.ftd          |   0
 .../one/a-website/01-hello-world/README.md    |   3 -
 .../tutor-tests/one/a-website/README.md       |   3 -
 .../tutor-tests/one/b-ui/01-hello-world.ftd   |   1 +
 .../one/b-ui/01-hello-world/README.md         |   3 -
 fastn-core/tutor-tests/one/b-ui/README.md     |   3 -
 fastn-core/tutor.js                           |  17 +-
 fastn/src/main.rs                             |  20 +-
 12 files changed, 51 insertions(+), 232 deletions(-)
 create mode 100644 fastn-core/tutor-tests/one/a-website/01-hello-world.ftd
 delete mode 100644 fastn-core/tutor-tests/one/a-website/01-hello-world/README.md
 delete mode 100644 fastn-core/tutor-tests/one/a-website/README.md
 create mode 100644 fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd
 delete mode 100644 fastn-core/tutor-tests/one/b-ui/01-hello-world/README.md
 delete mode 100644 fastn-core/tutor-tests/one/b-ui/README.md

diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index 8eb649e016..d042ee696b 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -201,6 +201,7 @@ pub async fn resolve_import_2022<'a>(
                 "fastn-apps".to_string(),
                 "is-reader".to_string(),
                 "package-query".to_string(),
+                "tutor".to_string(),
                 "pg".to_string(),
                 "package-tree".to_string(),
                 "fetch-file".to_string(),
@@ -252,6 +253,7 @@ pub async fn resolve_import_2022<'a>(
                 "figma-cs-token-old".to_string(),
                 "http".to_string(),
                 "package-query".to_string(),
+                "tutor".to_string(),
                 "pg".to_string(),
                 "toc".to_string(),
                 "include".to_string(),
diff --git a/fastn-core/src/lib.rs b/fastn-core/src/lib.rs
index 696d5f9baf..e3060da394 100644
--- a/fastn-core/src/lib.rs
+++ b/fastn-core/src/lib.rs
@@ -14,7 +14,7 @@ mod file;
 mod font;
 mod history;
 mod package;
-pub(crate) mod tutor;
+pub mod tutor;
 pub(crate) mod watcher;
 #[macro_use]
 mod http;
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 785aae6d03..586f5910f9 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -217,6 +217,7 @@ impl Library2022 {
         processor: String,
         doc: &'a mut ftd::interpreter::TDoc<'a>,
     ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
+        println!("process: {}", &processor);
         tracing::info!(
             msg = "stuck-on-processor",
             doc = doc.name,
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 7fffe1ab06..3d024427b4 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -1,3 +1,19 @@
+pub async fn main(package_name: String) -> fastn_core::Result<()> {
+    println!("starting TUTOR mode");
+    std::env::set_current_dir(&std::env::current_dir()?.join(".tutor"))?;
+    fastn_core::listen(
+        "127.0.0.1",
+        Some(2000),
+        None,
+        Some("2023".to_string()),
+        vec!["/-/tutor.js".to_string()],
+        vec![],
+        vec![],
+        vec![],
+        package_name,
+    )
+    .await
+}
 pub async fn pwd() -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
@@ -30,218 +46,34 @@ pub async fn process(
         ));
     }
 
+    dbg!("tutor process called");
     let state =
         match tokio::fs::read(dirs::home_dir().unwrap().join(".fastn").join("tutor.json")).await {
             Ok(v) => serde_json::from_slice(&v)?,
-            Err(e) => match e.kind() {
-                std::io::ErrorKind::NotFound => TutorStateFS::default(),
-                _ => return Err(e.into()),
+            Err(e) => match dbg!(e.kind()) {
+                std::io::ErrorKind::NotFound => {
+                    println!("not found, using default");
+                    TutorState::default()
+                }
+                _ => {
+                    println!("error: {:?}, {:?}", e, e.kind());
+                    return Err(e.into());
+                }
             },
-        }
-        .to_state(std::env::current_dir()?)?;
+        };
+    dbg!(&state);
 
     doc.from_json(&state, &kind, &value)
 }
 
-#[derive(Debug, Default, serde::Deserialize)]
-struct TutorStateFS {
+#[derive(Debug, Default, serde::Serialize, serde::Deserialize)]
+struct TutorState {
     done: Vec<String>,
     current: String,
 }
 
-#[derive(Debug, serde::Serialize, PartialEq)]
-struct TutorState {
-    workshops: Vec<Workshop>,
-}
-
-impl TutorStateFS {
-    fn to_state<T: AsRef<std::path::Path>>(
-        self: TutorStateFS,
-        path: T,
-    ) -> ftd::interpreter::Result<TutorState> {
-        use itertools::Itertools;
-
-        let mut workshops = vec![];
-        static RE: once_cell::sync::Lazy<regex::Regex> =
-            once_cell::sync::Lazy::new(|| regex::Regex::new(r"^[a-zA-Z]-[a-zA-Z]+.*$").unwrap());
-
-        for entry in std::fs::read_dir(path)?.sorted_by(sort_path) {
-            let entry = entry?;
-            let path = entry.path();
-
-            if !path.is_dir() {
-                continue;
-            }
-            if !RE.is_match(&path.file_name().unwrap().to_string_lossy()) {
-                continue;
-            }
-
-            workshops.push(Workshop::load(&path, &self)?);
-        }
-
-        Ok(TutorState { workshops })
-    }
-}
-
-fn sort_path(
-    a: &std::io::Result<std::fs::DirEntry>,
-    b: &std::io::Result<std::fs::DirEntry>,
-) -> std::cmp::Ordering {
-    a.as_ref().unwrap().path().cmp(&b.as_ref().unwrap().path())
-}
-
-#[derive(Debug, serde::Serialize, PartialEq)]
-struct Workshop {
-    title: String,
-    url: String,
-    done: bool,
-    current: bool,
-    tutorials: Vec<Tutorial>,
-}
-
-impl Workshop {
-    fn load(path: &std::path::Path, state: &TutorStateFS) -> ftd::interpreter::Result<Self> {
-        use itertools::Itertools;
-
-        let mut tutorials = vec![];
-        let id = path.file_name().unwrap().to_string_lossy();
-
-        static RE: once_cell::sync::Lazy<regex::Regex> =
-            once_cell::sync::Lazy::new(|| regex::Regex::new(r"^[0-9][0-9]-[a-zA-Z]+.*$").unwrap());
-
-        for entry in std::fs::read_dir(path)?.sorted_by(sort_path) {
-            let entry = entry?;
-            let path = entry.path();
-
-            if !path.is_dir() {
-                continue;
-            }
-            if !RE.is_match(&path.file_name().unwrap().to_string_lossy()) {
-                continue;
-            }
-
-            tutorials.push(Tutorial::load(&id, &path, state)?);
-        }
-
-        Ok(Workshop {
-            title: title_from_readme(path)?,
-            url: format!("/{id}/"),
-            done: !tutorials.iter().any(|t| !t.done),
-            current: tutorials.iter().any(|t| t.current),
-            tutorials,
-        })
-    }
-}
-
-fn title_from_readme(folder: &std::path::Path) -> ftd::interpreter::Result<String> {
-    let content = std::fs::read_to_string(folder.join("README.md"))?;
-    let (title, _about) = match content.split_once("\n\n") {
-        Some(v) => v,
-        None => {
-            return Err(ftd::interpreter::Error::OtherError(
-                "invalid README.md".into(),
-            ))
-        }
-    };
-    Ok(title.replacen("# ", "", 1))
-}
-
-#[derive(Debug, serde::Serialize, PartialEq)]
-struct Tutorial {
-    id: String,
-    url: String,
-    title: String,
-    done: bool,
-    /// current means this is the tutorial the user is currently working on
-    current: bool,
-    /// active means this is the page the user is seeing right now
-    active: bool,
-}
-
-impl Tutorial {
-    fn load(
-        parent: &str,
-        path: &std::path::Path,
-        state: &TutorStateFS,
-    ) -> ftd::interpreter::Result<Self> {
-        let id = format!("{parent}/{}", path.file_name().unwrap().to_string_lossy());
-
-        Ok(Tutorial {
-            title: title_from_readme(path)?,
-            done: state.done.contains(&id),
-            current: state.current == id,
-            url: format!("/{id}/"),
-            id,
-            active: false,
-        })
-    }
-}
-
 pub fn is_tutor() -> bool {
     // https://github.com/orgs/fastn-stack/discussions/1414
     // with either of these are passed we allow APIs like /-/shutdown/, `/-/start/` etc
     std::env::args().any(|e| e == "tutor" || e == "--tutor")
 }
-
-#[cfg(test)]
-mod test {
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test() {
-        let mut ts = super::TutorState {
-            workshops: vec![
-                super::Workshop {
-                    title: "Build Websites Using `fastn`".to_string(),
-                    url: "/a-website/".to_string(),
-                    done: false,
-                    current: false,
-                    tutorials: vec![super::Tutorial {
-                        id: "a-website/01-hello-world".to_string(),
-                        url: "/a-website/01-hello-world/".to_string(),
-                        title: "Install and start using `fastn`".to_string(),
-                        done: false,
-                        current: false,
-                        active: false,
-                    }],
-                },
-                super::Workshop {
-                    title: "Build User Interfaces Using `fastn`".to_string(),
-                    url: "/b-ui/".to_string(),
-                    done: false,
-                    current: false,
-                    tutorials: vec![super::Tutorial {
-                        id: "b-ui/01-hello-world".to_string(),
-                        url: "/b-ui/01-hello-world/".to_string(),
-                        title: "Install and start using `fastn`".to_string(),
-                        done: false,
-                        current: false,
-                        active: false,
-                    }],
-                },
-            ],
-        };
-
-        assert_eq!(
-            super::TutorStateFS::default()
-                .to_state("tutor-tests/one")
-                .unwrap(),
-            ts,
-        );
-
-        ts.workshops[0].tutorials[0].done = true;
-        ts.workshops[0].done = true;
-        ts.workshops[1].current = true;
-        ts.workshops[1].tutorials[0].current = true;
-
-        assert_eq!(
-            super::TutorStateFS {
-                done: vec!["a-website/01-hello-world".to_string()],
-                current: "b-ui/01-hello-world".to_string(),
-            }
-            .to_state("tutor-tests/one")
-            .unwrap(),
-            ts,
-        );
-    }
-}
diff --git a/fastn-core/tutor-tests/one/a-website/01-hello-world.ftd b/fastn-core/tutor-tests/one/a-website/01-hello-world.ftd
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/fastn-core/tutor-tests/one/a-website/01-hello-world/README.md b/fastn-core/tutor-tests/one/a-website/01-hello-world/README.md
deleted file mode 100644
index 11d9765222..0000000000
--- a/fastn-core/tutor-tests/one/a-website/01-hello-world/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Install and start using `fastn`
-
-In this exercise we will install fastn and create a basic hello world program.
\ No newline at end of file
diff --git a/fastn-core/tutor-tests/one/a-website/README.md b/fastn-core/tutor-tests/one/a-website/README.md
deleted file mode 100644
index cfd5187ce7..0000000000
--- a/fastn-core/tutor-tests/one/a-website/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build Websites Using `fastn`
-
-This workshop teaches you how to build websites using `fastn`.
\ No newline at end of file
diff --git a/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd b/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd
new file mode 100644
index 0000000000..91fde4f451
--- /dev/null
+++ b/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd
@@ -0,0 +1 @@
+-- tutorial:
\ No newline at end of file
diff --git a/fastn-core/tutor-tests/one/b-ui/01-hello-world/README.md b/fastn-core/tutor-tests/one/b-ui/01-hello-world/README.md
deleted file mode 100644
index 11d9765222..0000000000
--- a/fastn-core/tutor-tests/one/b-ui/01-hello-world/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Install and start using `fastn`
-
-In this exercise we will install fastn and create a basic hello world program.
\ No newline at end of file
diff --git a/fastn-core/tutor-tests/one/b-ui/README.md b/fastn-core/tutor-tests/one/b-ui/README.md
deleted file mode 100644
index 594b45e2af..0000000000
--- a/fastn-core/tutor-tests/one/b-ui/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build User Interfaces Using `fastn`
-
-This workshop teaches you how to build user interfaces using `fastn`.
\ No newline at end of file
diff --git a/fastn-core/tutor.js b/fastn-core/tutor.js
index e6134faecb..8f039b651a 100644
--- a/fastn-core/tutor.js
+++ b/fastn-core/tutor.js
@@ -1,6 +1,6 @@
 (function() {
     document.addEventListener("DOMContentLoaded", function() {
-        console.log("onload 1");
+        let sidebarWidth = "300px";
 
         let iframe = document.createElement('iframe');
         // iframe.src = "/-/tutor/";
@@ -8,12 +8,19 @@
         iframe.style.position = "fixed";
         iframe.style.top = "0";
         iframe.style.left = "0";
-        iframe.style.width = "100px";
+        iframe.style.width = sidebarWidth;
         iframe.style.height = "100vh";
 
-        document.body.style.paddingLeft = "100px";
+        document.body.style.paddingLeft = sidebarWidth;
         document.body.insertBefore(iframe, document.body.firstChild);
-        console.log("onload");
     });
-    console.log("registered");
+
+    window.onmessage = function(e) {
+        if (e.kind === 'navigate') {
+            document.location.href = e.url;
+            return;
+        }
+
+        console.warn('Unknown message', e);
+    };
 })();
\ No newline at end of file
diff --git a/fastn/src/main.rs b/fastn/src/main.rs
index 32eabbda00..b20708a5ea 100644
--- a/fastn/src/main.rs
+++ b/fastn/src/main.rs
@@ -84,25 +84,13 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
         return fastn_core::clone(clone.value_of_("source").unwrap()).await;
     }
 
-    let mut config = fastn_core::Config::read(None, true, None).await?;
-    let package_name = config.package.name.clone();
-
     if let Some(_tutor) = matches.subcommand_matches("tutor") {
-        println!("starting TUTOR mode");
-        return fastn_core::listen(
-            "127.0.0.1",
-            Some(2000),
-            None,
-            Some("2023".to_string()),
-            vec!["/-/tutor.js".to_string()],
-            vec![],
-            vec![],
-            vec![],
-            package_name,
-        )
-        .await;
+        return fastn_core::tutor::main("the-tutor".to_string()).await;
     }
 
+    let mut config = fastn_core::Config::read(None, true, None).await?;
+    let package_name = config.package.name.clone();
+
     if let Some(serve) = matches.subcommand_matches("serve") {
         let port = serve.value_of_("port").map(|p| match p.parse::<u16>() {
             Ok(v) => v,

From 06450f276c87dcf1cb6ea93a94608b24b5bff44e Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 30 Oct 2023 14:38:14 +0530
Subject: [PATCH 03/32] deleted unused test files

---
 Cargo.toml                                              | 1 -
 fastn-core/tutor-tests/one/a-website/01-hello-world.ftd | 0
 fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd      | 1 -
 3 files changed, 2 deletions(-)
 delete mode 100644 fastn-core/tutor-tests/one/a-website/01-hello-world.ftd
 delete mode 100644 fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd

diff --git a/Cargo.toml b/Cargo.toml
index 47b87cb96b..56b7b4f9ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,6 @@ exclude = ["fastn-runtime", "fastn-wasm"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.0"
 authors = [
     "Amit Upadhyay <upadhyay@gmail.com>",
     "Arpita Jaiswal <arpita@fifthtry.com>",
diff --git a/fastn-core/tutor-tests/one/a-website/01-hello-world.ftd b/fastn-core/tutor-tests/one/a-website/01-hello-world.ftd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd b/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd
deleted file mode 100644
index 91fde4f451..0000000000
--- a/fastn-core/tutor-tests/one/b-ui/01-hello-world.ftd
+++ /dev/null
@@ -1 +0,0 @@
--- tutorial:
\ No newline at end of file

From c8c5781905ac11eb5443a2ba7afee46a4a0fc3fe Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 30 Oct 2023 15:48:26 +0530
Subject: [PATCH 04/32] minor

---
 fastn-core/src/commands/serve.rs | 2 +-
 fastn-core/src/error.rs          | 6 ++++++
 fastn-core/src/tutor.rs          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 5b1f966f29..63ba98f516 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -250,7 +250,7 @@ pub async fn serve(
     let _lock = LOCK.read().await;
 
     // TODO: remove unwrap
-    let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse().unwrap();
+    let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse()?;
     let mut config = fastn_core::Config::read(None, false, Some(&req))
         .await
         .unwrap()
diff --git a/fastn-core/src/error.rs b/fastn-core/src/error.rs
index 8fd75af171..ffe119e823 100644
--- a/fastn-core/src/error.rs
+++ b/fastn-core/src/error.rs
@@ -90,6 +90,12 @@ pub enum Error {
     TokioMPSCError2(#[from] tokio::sync::mpsc::error::SendError<usize>),
 }
 
+impl From<std::convert::Infallible> for Error {
+    fn from(_: std::convert::Infallible) -> Self {
+        unreachable!()
+    }
+}
+
 impl Error {
     pub fn generic<T: AsRef<str> + ToString>(error: T) -> Self {
         Self::GenericError(error.to_string())
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 3d024427b4..397f167923 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -1,6 +1,6 @@
 pub async fn main(package_name: String) -> fastn_core::Result<()> {
     println!("starting TUTOR mode");
-    std::env::set_current_dir(&std::env::current_dir()?.join(".tutor"))?;
+    std::env::set_current_dir(std::env::current_dir()?.join(".tutor"))?;
     fastn_core::listen(
         "127.0.0.1",
         Some(2000),

From e1a7a63b21ca9f7f0b4903fbe8d885d65e6b106e Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 30 Oct 2023 16:25:19 +0530
Subject: [PATCH 05/32] mut not needed

---
 fastn-core/src/config/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastn-core/src/config/mod.rs b/fastn-core/src/config/mod.rs
index 6b3a309cde..d1884f092a 100644
--- a/fastn-core/src/config/mod.rs
+++ b/fastn-core/src/config/mod.rs
@@ -566,7 +566,7 @@ impl Config {
     }
 
     pub(crate) async fn get_file_and_package_by_cr_id(
-        &mut self,
+        &self,
         id: &str,
         cr_number: usize,
     ) -> fastn_core::Result<fastn_core::File> {

From b7abf47350a3cb8554edb2de5813fa9bc5ee6c8f Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 30 Oct 2023 18:56:54 +0530
Subject: [PATCH 06/32] 75 errors

---
 fastn-core/src/apis/cr.rs                     |   5 +-
 fastn-core/src/apis/edit.rs                   |  14 +-
 fastn-core/src/apis/edit_source.rs            |   6 +-
 fastn-core/src/auth/processor.rs              |  15 +-
 fastn-core/src/commands/build.rs              |  66 ++-
 fastn-core/src/commands/clone.rs              |   2 +-
 fastn-core/src/commands/serve.rs              |  82 ++--
 fastn-core/src/commands/stop_tracking.rs      |   2 +-
 fastn-core/src/commands/sync_status.rs        |   2 +-
 fastn-core/src/commands/update.rs             |   2 +-
 fastn-core/src/config/mod.rs                  | 438 +++++++++---------
 fastn-core/src/controller.rs                  |   2 +-
 fastn-core/src/doc.rs                         |  49 +-
 fastn-core/src/http.rs                        |   6 +
 fastn-core/src/lib.rs                         |   2 +-
 fastn-core/src/library/document.rs            | 184 ++++----
 fastn-core/src/library/fastn_dot_ftd.rs       |  68 +--
 fastn-core/src/library/mod.rs                 |  36 +-
 fastn-core/src/library2022/mod.rs             |  36 +-
 fastn-core/src/library2022/processor/apps.rs  |   5 +-
 .../src/library2022/processor/document.rs     |  48 +-
 .../src/library2022/processor/fetch_file.rs   |   4 +-
 .../src/library2022/processor/figma_tokens.rs |   2 -
 .../src/library2022/processor/get_data.rs     |   4 +-
 fastn-core/src/library2022/processor/http.rs  |  18 +-
 fastn-core/src/library2022/processor/query.rs |   4 +-
 .../src/library2022/processor/request_data.rs |  26 +-
 .../src/library2022/processor/sitemap.rs      |  10 +-
 .../src/library2022/processor/sqlite.rs       |   9 +-
 fastn-core/src/library2022/processor/toc.rs   |   1 -
 .../src/library2022/processor/user_details.rs |  17 +-
 .../src/library2022/processor/user_group.rs   |  37 +-
 fastn-core/src/library2022/utils.rs           |   4 +-
 fastn-core/src/package/app.rs                 |  20 +-
 fastn-core/src/package/package_doc.rs         |  38 +-
 fastn-core/src/package/user_group.rs          |  10 +-
 fastn-core/src/tutor.rs                       |   2 +-
 fastn-core/src/utils.rs                       |  38 +-
 fastn/src/main.rs                             |   2 +-
 39 files changed, 689 insertions(+), 627 deletions(-)

diff --git a/fastn-core/src/apis/cr.rs b/fastn-core/src/apis/cr.rs
index b754afeaa8..7240d18b3f 100644
--- a/fastn-core/src/apis/cr.rs
+++ b/fastn-core/src/apis/cr.rs
@@ -48,7 +48,8 @@ pub async fn create_cr_page(
 async fn create_cr_page_worker(
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let mut config = fastn_core::Config::read(None, false, Some(&req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
+    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     let create_cr_ftd = fastn_core::package_info_create_cr(&config)?;
 
     let main_document = fastn_core::Document {
@@ -58,7 +59,7 @@ async fn create_cr_page_worker(
         package_name: config.package.name.clone(),
     };
 
-    fastn_core::package::package_doc::read_ftd(&mut config, &main_document, "/", false, false)
+    fastn_core::package::package_doc::read_ftd(&mut req_config, &main_document, "/", false, false)
         .await
         .map(Into::into)
 }
diff --git a/fastn-core/src/apis/edit.rs b/fastn-core/src/apis/edit.rs
index 53a7d1a34e..ba5811eb9d 100644
--- a/fastn-core/src/apis/edit.rs
+++ b/fastn-core/src/apis/edit.rs
@@ -28,13 +28,14 @@ pub async fn edit(
     req: &fastn_core::http::Request,
     req_data: EditRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let mut config = match fastn_core::Config::read(None, false, Some(req)).await {
+    let mut config = match fastn_core::Config::read(None, false).await {
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
-    config.current_document = Some(req_data.path.to_string());
+    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+    req_config.current_document = Some(req_data.path.to_string());
 
-    match config.can_write(req, req_data.path.as_str()).await {
+    match req_config.can_write(req_data.path.as_str()).await {
         Ok(can_write) => {
             if !can_write {
                 return Ok(fastn_core::unauthorised!(
@@ -174,13 +175,12 @@ pub(crate) async fn edit_worker(
     })
 }
 
-pub async fn sync(
-    req: fastn_core::http::Request,
-) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = match fastn_core::Config::read(None, false, Some(&req)).await {
+pub async fn sync() -> fastn_core::Result<fastn_core::http::Response> {
+    let config = match fastn_core::Config::read(None, false).await {
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
+
     match fastn_core::commands::sync::sync(&config, None).await {
         Ok(_) => {
             #[derive(serde::Serialize)]
diff --git a/fastn-core/src/apis/edit_source.rs b/fastn-core/src/apis/edit_source.rs
index a59f721b26..e706ce402c 100644
--- a/fastn-core/src/apis/edit_source.rs
+++ b/fastn-core/src/apis/edit_source.rs
@@ -21,7 +21,9 @@ async fn handle_view_source(
     req: &fastn_core::http::Request,
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
-    let mut config = fastn_core::Config::read(None, false, Some(req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
+    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = config.get_file_and_package_by_id(path).await?;
 
@@ -35,7 +37,7 @@ async fn handle_view_source(
                 package_name: config.package.name.clone(),
             };
             fastn_core::package::package_doc::read_ftd(
-                &mut config,
+                &mut req_config,
                 &main_document,
                 "/",
                 false,
diff --git a/fastn-core/src/auth/processor.rs b/fastn-core/src/auth/processor.rs
index cd2dd82a9f..e392061501 100644
--- a/fastn-core/src/auth/processor.rs
+++ b/fastn-core/src/auth/processor.rs
@@ -3,19 +3,16 @@
 pub fn user_details(
     section: &ftd::ftd2021::p1::Section,
     doc: &ftd::ftd2021::p2::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::ftd2021::p1::Result<ftd::Value> {
     let mut found_cookie = false;
-    let is_login = match &config.request {
-        Some(req) => {
-            for auth_provider in fastn_core::auth::AuthProviders::AUTH_ITER.iter() {
-                if req.cookie(auth_provider.as_str()).is_some() {
-                    found_cookie = true;
-                }
+    let is_login = {
+        for auth_provider in fastn_core::auth::AuthProviders::AUTH_ITER.iter() {
+            if req_config.request.cookie(auth_provider.as_str()).is_some() {
+                found_cookie = true;
             }
-            found_cookie
         }
-        None => false,
+        found_cookie
     };
 
     #[derive(Debug, serde::Serialize)]
diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 6a21114dc6..3ff954ef08 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -1,6 +1,6 @@
 // #[tracing::instrument(skip(config))]
 pub async fn build(
-    config: &mut fastn_core::Config,
+    config: &fastn_core::Config,
     only_id: Option<&str>,
     base_url: &str,
     ignore_failed: bool,
@@ -9,6 +9,9 @@ pub async fn build(
 ) -> fastn_core::Result<()> {
     tokio::fs::create_dir_all(config.build_dir()).await?;
 
+    let req = fastn_core::http::Request::default();
+
+    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     // Default css and js
     default_build_files(
         config.root.join(".build"),
@@ -18,14 +21,23 @@ pub async fn build(
     .await?;
 
     {
-        let documents = get_documents_for_current_package(config).await?;
+        let documents = get_documents_for_current_package(&mut req_config).await?;
 
         match only_id {
             Some(id) => {
-                return handle_only_id(id, config, base_url, ignore_failed, test, documents).await
+                return handle_only_id(
+                    id,
+                    &mut req_config,
+                    base_url,
+                    ignore_failed,
+                    test,
+                    documents,
+                )
+                .await
             }
             None => {
-                incremental_build(config, &documents, base_url, ignore_failed, test).await?;
+                incremental_build(&mut req_config, &documents, base_url, ignore_failed, test)
+                    .await?;
             }
         }
     }
@@ -197,7 +209,7 @@ fn is_virtual_dep(path: &str) -> bool {
 }
 
 async fn handle_dependency_file(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     cache: &mut cache::Cache,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
@@ -228,7 +240,7 @@ async fn handle_dependency_file(
 
 // removes deleted documents from cache and build folder
 fn remove_deleted_documents(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     c: &mut cache::Cache,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
 ) -> fastn_core::Result<()> {
@@ -253,7 +265,7 @@ fn remove_deleted_documents(
         .collect_vec();
 
     for removed_doc_id in &removed_documents {
-        let folder_path = config.build_dir().join(removed_doc_id);
+        let folder_path = config.config.build_dir().join(removed_doc_id);
         let folder_parent = folder_path.parent();
         let file_path = &folder_path.with_extension("ftd");
 
@@ -278,7 +290,7 @@ fn remove_deleted_documents(
 
 #[tracing::instrument(skip(config, documents))]
 async fn incremental_build(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
     ignore_failed: bool,
@@ -311,7 +323,9 @@ async fn incremental_build(
                 let dependencies: Vec<String> = doc
                     .dependencies
                     .iter()
-                    .map(|dep| get_dependency_name_without_package_name(&config.package.name, dep))
+                    .map(|dep| {
+                        get_dependency_name_without_package_name(&config.config.package.name, dep)
+                    })
                     .collect_vec();
 
                 for dep in &dependencies {
@@ -411,7 +425,7 @@ async fn incremental_build(
 #[tracing::instrument(skip(config, documents))]
 async fn handle_only_id(
     id: &str,
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -426,13 +440,13 @@ async fn handle_only_id(
     Err(fastn_core::Error::GenericError(format!(
         "Document {} not found in package {}",
         id,
-        config.package.name.as_str()
+        config.config.package.name.as_str()
     )))
 }
 
 async fn handle_file(
     document: &fastn_core::File,
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -456,7 +470,7 @@ async fn handle_file(
         fastn_core::utils::print_end(
             format!(
                 "Processed {}/{}",
-                config.package.name.as_str(),
+                config.config.package.name.as_str(),
                 document.get_id()
             )
             .as_str(),
@@ -467,7 +481,7 @@ async fn handle_file(
         fastn_core::utils::print_error(
             format!(
                 "Failed {}/{}",
-                config.package.name.as_str(),
+                config.config.package.name.as_str(),
                 document.get_id()
             )
             .as_str(),
@@ -570,7 +584,7 @@ fn remove_extension(id: &str) -> String {
 #[tracing::instrument(skip(document, config, cache))]
 async fn handle_file_(
     document: &fastn_core::File,
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -596,8 +610,8 @@ async fn handle_file_(
             }
 
             fastn_core::utils::copy(
-                config.root.join(doc.id.as_str()),
-                config.root.join(".build").join(doc.id.as_str()),
+                config.config.root.join(doc.id.as_str()),
+                config.config.root.join(".build").join(doc.id.as_str()),
             )
             .await
             .ok();
@@ -640,25 +654,27 @@ async fn handle_file_(
                 }
             }
         }
-        fastn_core::File::Static(sa) => process_static(sa, &config.root, &config.package).await?,
+        fastn_core::File::Static(sa) => {
+            process_static(sa, &config.config.root, &config.config.package).await?
+        }
         fastn_core::File::Markdown(_doc) => {
             // TODO: bring this feature back
             print!("Skipped ");
             return Ok(());
         }
         fastn_core::File::Image(main_doc) => {
-            process_static(main_doc, &config.root, &config.package).await?;
+            process_static(main_doc, &config.config.root, &config.package).await?;
         }
         fastn_core::File::Code(doc) => {
             process_static(
                 &fastn_core::Static {
-                    package_name: config.package.name.to_string(),
+                    package_name: config.config.package.name.to_string(),
                     id: doc.id.to_string(),
                     content: doc.content.clone().into_bytes(),
                     base_path: camino::Utf8PathBuf::from(doc.parent_path.as_str()),
                 },
-                &config.root,
-                &config.package,
+                &config.config.root,
+                &config.config.package,
             )
             .await?;
         }
@@ -732,17 +748,18 @@ pub async fn default_build_files(
 
 #[tracing::instrument(skip(config))]
 async fn get_documents_for_current_package(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
 ) -> fastn_core::Result<std::collections::BTreeMap<String, fastn_core::File>> {
     let mut documents = std::collections::BTreeMap::from_iter(
         config
+            .config
             .get_files(&config.package)
             .await?
             .into_iter()
             .map(|v| (v.get_id().to_string(), v)),
     );
 
-    if let Some(ref sitemap) = config.package.sitemap {
+    if let Some(ref sitemap) = config.config.package.sitemap {
         let new_config = config.clone();
         let get_all_locations = sitemap.get_all_locations();
         let mut files: std::collections::HashMap<String, fastn_core::File> = Default::default();
@@ -771,6 +788,7 @@ async fn get_documents_for_current_package(
         }
 
         config
+            .config
             .all_packages
             .borrow_mut()
             .extend(new_config.all_packages.into_inner());
diff --git a/fastn-core/src/commands/clone.rs b/fastn-core/src/commands/clone.rs
index 4e9b63348b..cb7912bf33 100644
--- a/fastn-core/src/commands/clone.rs
+++ b/fastn-core/src/commands/clone.rs
@@ -14,7 +14,7 @@ pub async fn clone(source: &str) -> fastn_core::Result<()> {
     }))
     .await;
 
-    let config = fastn_core::Config::read(Some(root.as_str().to_string()), false, None).await?;
+    let config = fastn_core::Config::read(Some(root.as_str().to_string()), false).await?;
     config.create_clone_workspace().await?;
     config
         .write_clone_available_cr(clone_response.reserved_crs.as_slice())
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 63ba98f516..b038b3ff47 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -3,7 +3,7 @@ static LOCK: once_cell::sync::Lazy<async_lock::RwLock<()>> =
 
 #[tracing::instrument(skip_all)]
 fn handle_redirect(
-    config: &mut fastn_core::Config,
+    config: &fastn_core::Config,
     path: &camino::Utf8Path,
 ) -> Option<fastn_core::http::Response> {
     config
@@ -19,10 +19,10 @@ fn handle_redirect(
 ///
 #[tracing::instrument(skip_all)]
 async fn serve_file(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig<'_>,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
-    if let Some(r) = handle_redirect(config, path) {
+    if let Some(r) = handle_redirect(config.config, path) {
         return r;
     }
 
@@ -42,13 +42,7 @@ async fn serve_file(
 
     // Auth Stuff
     if !f.is_static() {
-        let req = if let Some(ref r) = config.request {
-            r
-        } else {
-            return fastn_core::server_error!("request not set");
-        };
-
-        match config.can_read(req, path.as_str(), true).await {
+        match config.can_read(path.as_str(), true).await {
             Ok(can_read) => {
                 if !can_read {
                     tracing::error!(
@@ -130,8 +124,7 @@ async fn serve_file(
 }
 
 async fn serve_cr_file(
-    req: &fastn_core::http::Request,
-    config: &mut fastn_core::Config,
+    req_config: &mut fastn_core::RequestConfig<'_>,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
@@ -148,7 +141,7 @@ async fn serve_cr_file(
 
     // Auth Stuff
     if !f.is_static() {
-        match config.can_read(req, path.as_str(), true).await {
+        match req_config.can_read(path.as_str(), true).await {
             Ok(can_read) => {
                 if !can_read {
                     return fastn_core::unauthorised!("You are unauthorized to access: {}", path);
@@ -240,32 +233,22 @@ async fn static_file(file_path: camino::Utf8PathBuf) -> fastn_core::http::Respon
 
 #[tracing::instrument(skip_all)]
 pub async fn serve(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
-    edition: Option<String>,
-    external_js: Vec<String>,
-    inline_js: Vec<String>,
-    external_css: Vec<String>,
-    inline_css: Vec<String>,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
 
+    let mut req_config = fastn_core::RequestConfig::new(config, &req);
+
     // TODO: remove unwrap
     let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse()?;
-    let mut config = fastn_core::Config::read(None, false, Some(&req))
-        .await
-        .unwrap()
-        .add_edition(edition)?
-        .add_external_js(external_js)
-        .add_inline_js(inline_js)
-        .add_external_css(external_css)
-        .add_inline_css(inline_css);
 
     Ok(if path.eq(&camino::Utf8PathBuf::new().join("FASTN.ftd")) {
         serve_fastn_file(&config).await
     } else if path.eq(&camino::Utf8PathBuf::new().join("")) {
-        serve_file(&mut config, &path.join("/")).await
+        serve_file(&mut req_config, &path.join("/")).await
     } else if let Some(cr_number) = fastn_core::cr::get_cr_path_from_url(path.as_str()) {
-        serve_cr_file(&req, &mut config, &path, cr_number).await
+        serve_cr_file(&mut req_config, &path, cr_number).await
     } else {
         // url is present in config or not
         // If not present than proxy pass it
@@ -319,7 +302,7 @@ pub async fn serve(
 
         // if request goes with mount-point /todos/api/add-todo/
         // so it should say not found and pass it to proxy
-        let file_response = serve_file(&mut config, path.as_path()).await;
+        let file_response = serve_file(&mut req_config, path.as_path()).await;
         // If path is not present in sitemap then pass it to proxy
         // TODO: Need to handle other package URL as well, and that will start from `-`
         // and all the static files starts with `-`
@@ -345,12 +328,6 @@ pub async fn serve(
             } else {
                 format!("{}://{}", url.scheme(), url.host_str().unwrap())
             };
-            let req = if let Some(r) = config.request {
-                r
-            } else {
-                tracing::error!(msg = "request not set");
-                return Ok(fastn_core::server_error!("request not set"));
-            };
 
             // TODO: read app config and send them to service as header
             // Adjust x-fastn header from based on the platform and the requested field
@@ -360,7 +337,7 @@ pub async fn serve(
                         if let Some(user_data) = fastn_core::auth::get_user_data_from_cookies(
                             platform,
                             requested_field,
-                            req.cookies(),
+                            req_config.request.cookies(),
                         )
                         .await?
                         {
@@ -625,7 +602,8 @@ async fn test() -> fastn_core::Result<fastn_core::http::Response> {
 }
 
 #[tracing::instrument(skip_all)]
-async fn route(
+async fn actual_route(
+    config: &fastn_core::Config,
     req: actix_web::HttpRequest,
     body: actix_web::web::Bytes,
     app_data: actix_web::web::Data<AppData>,
@@ -659,20 +637,28 @@ async fn route(
         ("get", "/-/pwd/") => fastn_core::tutor::pwd().await,
         ("get", "/-/tutor.js") => fastn_core::tutor::js().await,
         ("get", "/-/shutdown/") => fastn_core::tutor::shutdown().await,
-        (_, _) => {
-            serve(
-                req,
-                app_data.edition.clone(),
-                app_data.external_js.clone(),
-                app_data.inline_js.clone(),
-                app_data.external_css.clone(),
-                app_data.inline_css.clone(),
-            )
-            .await
-        }
+        (_, _) => serve(config, req).await,
     }
 }
 
+#[tracing::instrument(skip_all)]
+async fn route(
+    req: actix_web::HttpRequest,
+    body: actix_web::web::Bytes,
+    app_data: actix_web::web::Data<AppData>,
+) -> fastn_core::Result<fastn_core::http::Response> {
+    let config = fastn_core::Config::read(None, false)
+        .await
+        .unwrap()
+        .add_edition(edition)?
+        .add_external_js(external_js)
+        .add_inline_js(inline_js)
+        .add_external_css(external_css)
+        .add_inline_css(inline_css);
+
+    actual_route(&config, req, body, app_data).await
+}
+
 //noinspection HttpUrlsUsage
 #[allow(clippy::too_many_arguments)]
 pub async fn listen(
diff --git a/fastn-core/src/commands/stop_tracking.rs b/fastn-core/src/commands/stop_tracking.rs
index 64480f2230..5c06580c46 100644
--- a/fastn-core/src/commands/stop_tracking.rs
+++ b/fastn-core/src/commands/stop_tracking.rs
@@ -22,7 +22,7 @@ pub async fn handle_command(matches: &clap::ArgMatches) -> fastn_core::Result<()
     use fastn_core::utils::ValueOf;
 
     stop_tracking(
-        &fastn_core::Config::read(None, true, None).await?,
+        &fastn_core::Config::read(None, true).await?,
         matches.value_of_("source").unwrap(),
         matches.value_of_("target"),
     )
diff --git a/fastn-core/src/commands/sync_status.rs b/fastn-core/src/commands/sync_status.rs
index d5de737a74..062f46de3e 100644
--- a/fastn-core/src/commands/sync_status.rs
+++ b/fastn-core/src/commands/sync_status.rs
@@ -11,7 +11,7 @@ pub async fn handle_command(matches: &clap::ArgMatches) -> fastn_core::Result<()
     use fastn_core::utils::ValueOf;
 
     sync_status(
-        &fastn_core::Config::read(None, true, None).await?,
+        &fastn_core::Config::read(None, true).await?,
         matches.value_of_("file"), // TODO: handle multiple files
     )
     .await
diff --git a/fastn-core/src/commands/update.rs b/fastn-core/src/commands/update.rs
index 66093dad08..6b0363fe77 100644
--- a/fastn-core/src/commands/update.rs
+++ b/fastn-core/src/commands/update.rs
@@ -6,7 +6,7 @@ pub async fn update(config: &fastn_core::Config) -> fastn_core::Result<()> {
         }
     };
 
-    let c = fastn_core::Config::read(None, false, None).await?;
+    let c = fastn_core::Config::read(None, false).await?;
     if c.package.dependencies.is_empty() {
         println!("No dependencies to update.")
     } else if c.package.dependencies.len() == 1 {
diff --git a/fastn-core/src/config/mod.rs b/fastn-core/src/config/mod.rs
index d1884f092a..9694fbf629 100644
--- a/fastn-core/src/config/mod.rs
+++ b/fastn-core/src/config/mod.rs
@@ -34,13 +34,7 @@ pub struct Config {
     pub packages_root: camino::Utf8PathBuf,
     pub original_directory: camino::Utf8PathBuf,
     pub all_packages: std::cell::RefCell<std::collections::BTreeMap<String, fastn_core::Package>>,
-    pub downloaded_assets: std::collections::BTreeMap<String, String>,
     pub global_ids: std::collections::HashMap<String, String>,
-    pub named_parameters: Vec<(String, ftd::Value)>,
-    pub extra_data: std::collections::BTreeMap<String, String>,
-    pub current_document: Option<String>,
-    pub dependencies_during_render: Vec<String>,
-    pub request: Option<fastn_core::http::Request>, // TODO: It should only contain reference
     pub ftd_edition: FTDEdition,
     pub ftd_external_js: Vec<String>,
     pub ftd_inline_js: Vec<String>,
@@ -48,6 +42,232 @@ pub struct Config {
     pub ftd_inline_css: Vec<String>,
 }
 
+#[derive(Debug, Clone)]
+pub struct RequestConfig<'a> {
+    pub named_parameters: Vec<(String, ftd::Value)>,
+    pub extra_data: std::collections::BTreeMap<String, String>,
+    pub downloaded_assets: std::collections::BTreeMap<String, String>,
+    pub current_document: Option<String>,
+    pub dependencies_during_render: Vec<String>,
+    pub request: &'a fastn_core::http::Request,
+    pub config: &'a Config,
+}
+
+impl<'a> RequestConfig<'a> {
+    pub fn new(config: &Config, request: &fastn_core::http::Request) -> Self {
+        RequestConfig {
+            named_parameters: vec![],
+            extra_data: Default::default(),
+            downloaded_assets: Default::default(),
+            current_document: None,
+            dependencies_during_render: vec![],
+            request,
+            config,
+        }
+    }
+
+    pub fn doc_id(&self) -> Option<String> {
+        self.current_document
+            .clone()
+            .map(|v| fastn_core::utils::id_to_path(v.as_str()))
+            .map(|v| v.trim().replace(std::path::MAIN_SEPARATOR, "/"))
+    }
+
+    /// document_name_with_default("index.ftd") -> /
+    /// document_name_with_default("foo/index.ftd") -> /foo/
+    /// document_name_with_default("foo/abc") -> /foo/abc/
+    /// document_name_with_default("/foo/abc.ftd") -> /foo/abc/
+    pub(crate) fn document_name_with_default(&self, document_path: &str) -> String {
+        let name = self
+            .doc_id()
+            .unwrap_or_else(|| document_path.to_string())
+            .trim_matches('/')
+            .to_string();
+        if name.is_empty() {
+            "/".to_string()
+        } else {
+            format!("/{}/", name)
+        }
+    }
+
+    // -/kameri-app.herokuapp.com/
+    // .packages/kameri-app.heroku.com/index.ftd
+    #[tracing::instrument(skip_all)]
+    pub async fn get_file_and_package_by_id(
+        &mut self,
+        path: &str,
+    ) -> fastn_core::Result<fastn_core::File> {
+        tracing::info!(path = path);
+        // This function will return file and package by given path
+        // path can be mounted(mount-point) with other dependencies
+        //
+        // Sanitize the mountpoint request.
+        // Get the package and sanitized path
+        let package1;
+
+        // TODO: The shitty code written by me ever
+        let (path_with_package_name, document, path_params, extra_data) =
+            if !fastn_core::file::is_static(path)? {
+                let (path_with_package_name, sanitized_package, sanitized_path) = match self
+                    .config
+                    .get_mountpoint_sanitized_path(&self.config.package, path)
+                {
+                    Some((new_path, package, remaining_path, _)) => {
+                        // Update the sitemap of the package, if it does not contain the sitemap information
+                        if package.name != self.config.package.name {
+                            package1 = self.config.update_sitemap(package).await?;
+                            (new_path, &package1, remaining_path)
+                        } else {
+                            (new_path, package, remaining_path)
+                        }
+                    }
+                    None => (path.to_string(), &self.config.package, path.to_string()),
+                };
+
+                // Getting `document` with dynamic parameters, if exists
+                // It will first resolve in sitemap
+                // Then it will resolve in the dynamic urls
+                let (document, path_params, extra_data) =
+                    fastn_core::sitemap::resolve(sanitized_package, &sanitized_path)?;
+
+                // document with package-name prefix
+                let document = document.map(|doc| {
+                    format!(
+                        "-/{}/{}",
+                        sanitized_package.name.trim_matches('/'),
+                        doc.trim_matches('/')
+                    )
+                });
+                (path_with_package_name, document, path_params, extra_data)
+            } else {
+                (path.to_string(), None, vec![], Default::default())
+            };
+
+        let path = path_with_package_name.as_str();
+
+        if let Some(id) = document {
+            let file_name = self.config.get_file_path_and_resolve(id.as_str()).await?;
+            let package = self.config.find_package_by_id(id.as_str()).await?.1;
+            let file = fastn_core::get_file(
+                package.name.to_string(),
+                &self.config.root.join(file_name),
+                &self.config.get_root_for_package(&package),
+            )
+            .await?;
+            self.current_document = Some(path.to_string());
+            self.named_parameters = path_params;
+            self.extra_data = extra_data;
+            Ok(file)
+        } else {
+            // -/fifthtry.github.io/todos/add-todo/
+            // -/fifthtry.github.io/doc-site/add-todo/
+            let file_name = self.config.get_file_path_and_resolve(path).await?;
+            // .packages/todos/add-todo.ftd
+            // .packages/fifthtry.github.io/doc-site/add-todo.ftd
+
+            let package = self.config.find_package_by_id(path).await?.1;
+            let mut file = fastn_core::get_file(
+                package.name.to_string(),
+                &self.config.root.join(file_name.trim_start_matches('/')),
+                &self.config.get_root_for_package(&package),
+            )
+            .await?;
+
+            if path.contains("-/") {
+                let url = path.trim_end_matches("/index.html").trim_matches('/');
+                let extension = if matches!(file, fastn_core::File::Markdown(_)) {
+                    "/index.md".to_string()
+                } else if matches!(file, fastn_core::File::Ftd(_)) {
+                    "/index.ftd".to_string()
+                } else {
+                    "".to_string()
+                };
+                file.set_id(format!("{}{}", url, extension).as_str());
+            }
+            self.current_document = Some(file.get_id().to_string());
+            Ok(file)
+        }
+    }
+    #[tracing::instrument(skip(self))]
+    pub(crate) async fn can_read(
+        &self,
+        document_path: &str,
+        with_confidential: bool, // can read should use confidential property or not
+    ) -> fastn_core::Result<bool> {
+        // Function Docs
+        // If user can read the document based on readers, user will have read access to page
+        // If user cannot read the document based on readers, and if confidential is false so user
+        // can access the page, and if confidential is true user will not be able to access the
+        // document
+
+        // can_read: true, confidential: true => true (can access)
+        // can_read: true, confidential: false => true (can access)
+        // can_read: false, confidential: true => false (cannot access)
+        // can_read: false, confidential: false => true (can access)
+
+        use itertools::Itertools;
+        let document_name = self.document_name_with_default(document_path);
+        if let Some(sitemap) = &self.config.package.sitemap {
+            // TODO: This can be buggy in case of: if groups are used directly in sitemap are foreign groups
+            let (document_readers, confidential) =
+                sitemap.readers(document_name.as_str(), &self.config.package.groups);
+
+            // TODO: Need to check the confidential logic, if readers are not defined in the sitemap
+            if document_readers.is_empty() {
+                return Ok(true);
+            }
+            let access_identities = fastn_core::user_group::access_identities(
+                self.config,
+                self.request,
+                &document_name,
+                true,
+            )
+            .await?;
+
+            let belongs_to = fastn_core::user_group::belongs_to(
+                self.config,
+                document_readers.as_slice(),
+                access_identities.iter().collect_vec().as_slice(),
+            )?;
+
+            if with_confidential {
+                if belongs_to {
+                    return Ok(true);
+                }
+                return Ok(!confidential);
+            }
+            return Ok(belongs_to);
+        }
+        Ok(true)
+    }
+
+    #[tracing::instrument(skip(self))]
+    pub(crate) async fn can_write(&self, document_path: &str) -> fastn_core::Result<bool> {
+        use itertools::Itertools;
+        let document_name = self.document_name_with_default(document_path);
+        if let Some(sitemap) = &self.config.package.sitemap {
+            // TODO: This can be buggy in case of: if groups are used directly in sitemap are foreign groups
+            let document_writers =
+                sitemap.writers(document_name.as_str(), &self.config.package.groups);
+            let access_identities = fastn_core::user_group::access_identities(
+                self.config,
+                self.request,
+                &document_name,
+                false,
+            )
+            .await?;
+
+            return fastn_core::user_group::belongs_to(
+                self.config,
+                document_writers.as_slice(),
+                access_identities.iter().collect_vec().as_slice(),
+            );
+        }
+
+        Ok(false)
+    }
+}
+
 impl Config {
     /// `build_dir` is where the static built files are stored. `fastn build` command creates this
     /// folder and stores its output here.
@@ -148,23 +368,6 @@ impl Config {
         self.remote_history_dir().join(id_with_timestamp_extension)
     }
 
-    /// document_name_with_default("index.ftd") -> /
-    /// document_name_with_default("foo/index.ftd") -> /foo/
-    /// document_name_with_default("foo/abc") -> /foo/abc/
-    /// document_name_with_default("/foo/abc.ftd") -> /foo/abc/
-    pub(crate) fn document_name_with_default(&self, document_path: &str) -> String {
-        let name = self
-            .doc_id()
-            .unwrap_or_else(|| document_path.to_string())
-            .trim_matches('/')
-            .to_string();
-        if name.is_empty() {
-            "/".to_string()
-        } else {
-            format!("/{}/", name)
-        }
-    }
-
     /// history of a fastn package is stored in `.history` folder.
     ///
     /// Current design is wrong, we should move this helper to `fastn_core::Package` maybe.
@@ -706,110 +909,6 @@ impl Config {
         Ok(package)
     }
 
-    // -/kameri-app.herokuapp.com/
-    // .packages/kameri-app.heroku.com/index.ftd
-    #[tracing::instrument(skip_all)]
-    pub async fn get_file_and_package_by_id(
-        &mut self,
-        path: &str,
-    ) -> fastn_core::Result<fastn_core::File> {
-        tracing::info!(path = path);
-        // This function will return file and package by given path
-        // path can be mounted(mount-point) with other dependencies
-        //
-        // Sanitize the mountpoint request.
-        // Get the package and sanitized path
-        let package1;
-
-        // TODO: The shitty code written by me ever
-        let (path_with_package_name, document, path_params, extra_data) =
-            if !fastn_core::file::is_static(path)? {
-                let (path_with_package_name, sanitized_package, sanitized_path) =
-                    match self.get_mountpoint_sanitized_path(&self.package, path) {
-                        Some((new_path, package, remaining_path, _)) => {
-                            // Update the sitemap of the package, if it does not contain the sitemap information
-                            if package.name != self.package.name {
-                                package1 = self.update_sitemap(package).await?;
-                                (new_path, &package1, remaining_path)
-                            } else {
-                                (new_path, package, remaining_path)
-                            }
-                        }
-                        None => (path.to_string(), &self.package, path.to_string()),
-                    };
-
-                // Getting `document` with dynamic parameters, if exists
-                // It will first resolve in sitemap
-                // Then it will resolve in the dynamic urls
-                let (document, path_params, extra_data) =
-                    fastn_core::sitemap::resolve(sanitized_package, &sanitized_path)?;
-
-                // document with package-name prefix
-                let document = document.map(|doc| {
-                    format!(
-                        "-/{}/{}",
-                        sanitized_package.name.trim_matches('/'),
-                        doc.trim_matches('/')
-                    )
-                });
-                (path_with_package_name, document, path_params, extra_data)
-            } else {
-                (path.to_string(), None, vec![], Default::default())
-            };
-
-        let path = path_with_package_name.as_str();
-
-        if let Some(id) = document {
-            let file_name = self.get_file_path_and_resolve(id.as_str()).await?;
-            let package = self.find_package_by_id(id.as_str()).await?.1;
-            let file = fastn_core::get_file(
-                package.name.to_string(),
-                &self.root.join(file_name),
-                &self.get_root_for_package(&package),
-            )
-            .await?;
-            self.current_document = Some(path.to_string());
-            self.named_parameters = path_params;
-            self.extra_data = extra_data;
-            Ok(file)
-        } else {
-            // -/fifthtry.github.io/todos/add-todo/
-            // -/fifthtry.github.io/doc-site/add-todo/
-            let file_name = self.get_file_path_and_resolve(path).await?;
-            // .packages/todos/add-todo.ftd
-            // .packages/fifthtry.github.io/doc-site/add-todo.ftd
-
-            let package = self.find_package_by_id(path).await?.1;
-            let mut file = fastn_core::get_file(
-                package.name.to_string(),
-                &self.root.join(file_name.trim_start_matches('/')),
-                &self.get_root_for_package(&package),
-            )
-            .await?;
-
-            if path.contains("-/") {
-                let url = path.trim_end_matches("/index.html").trim_matches('/');
-                let extension = if matches!(file, fastn_core::File::Markdown(_)) {
-                    "/index.md".to_string()
-                } else if matches!(file, fastn_core::File::Ftd(_)) {
-                    "/index.ftd".to_string()
-                } else {
-                    "".to_string()
-                };
-                file.set_id(format!("{}{}", url, extension).as_str());
-            }
-            self.current_document = Some(file.get_id().to_string());
-            Ok(file)
-        }
-    }
-
-    pub fn doc_id(&self) -> Option<String> {
-        self.current_document
-            .clone()
-            .map(|v| fastn_core::utils::id_to_path(v.as_str()))
-            .map(|v| v.trim().replace(std::path::MAIN_SEPARATOR, "/"))
-    }
-
     pub async fn get_file_path(&self, id: &str) -> fastn_core::Result<String> {
         let (package_name, package) = self.find_package_by_id(id).await?;
         let mut id = id.to_string();
@@ -1251,7 +1350,6 @@ impl Config {
     pub async fn read(
         root: Option<String>,
         resolve_sitemap: bool,
-        req: Option<&fastn_core::http::Request>,
     ) -> fastn_core::Result<fastn_core::Config> {
         let (root, original_directory) = match root {
             Some(r) => {
@@ -1280,19 +1378,13 @@ impl Config {
             packages_root: root.clone().join(".packages"),
             root,
             original_directory,
-            current_document: None,
             all_packages: Default::default(),
-            downloaded_assets: Default::default(),
-            extra_data: Default::default(),
             global_ids: Default::default(),
-            request: req.map(ToOwned::to_owned),
-            named_parameters: vec![],
             ftd_edition: FTDEdition::default(),
             ftd_external_js: Default::default(),
             ftd_inline_js: Default::default(),
             ftd_external_css: Default::default(),
             ftd_inline_css: Default::default(),
-            dependencies_during_render: Default::default(),
         };
 
         // Update global_ids map from the current package files
@@ -1351,11 +1443,6 @@ impl Config {
         Ok(config)
     }
 
-    pub fn set_request(mut self, req: fastn_core::http::Request) -> Self {
-        self.request = Some(req);
-        self
-    }
-
     pub(crate) async fn resolve_package(
         &self,
         package: &fastn_core::Package,
@@ -1418,77 +1505,4 @@ impl Config {
             (value - (number_of_crs_to_reserve as i32))..value,
         ))
     }
-
-    #[tracing::instrument(skip(req, self))]
-    pub(crate) async fn can_read(
-        &self,
-        req: &fastn_core::http::Request,
-        document_path: &str,
-        with_confidential: bool, // can read should use confidential property or not
-    ) -> fastn_core::Result<bool> {
-        // Function Docs
-        // If user can read the document based on readers, user will have read access to page
-        // If user cannot read the document based on readers, and if confidential is false so user
-        // can access the page, and if confidential is true user will not be able to access the
-        // document
-
-        // can_read: true, confidential: true => true (can access)
-        // can_read: true, confidential: false => true (can access)
-        // can_read: false, confidential: true => false (cannot access)
-        // can_read: false, confidential: false => true (can access)
-
-        use itertools::Itertools;
-        let document_name = self.document_name_with_default(document_path);
-        if let Some(sitemap) = &self.package.sitemap {
-            // TODO: This can be buggy in case of: if groups are used directly in sitemap are foreign groups
-            let (document_readers, confidential) =
-                sitemap.readers(document_name.as_str(), &self.package.groups);
-
-            // TODO: Need to check the confidential logic, if readers are not defined in the sitemap
-            if document_readers.is_empty() {
-                return Ok(true);
-            }
-            let access_identities =
-                fastn_core::user_group::access_identities(self, req, &document_name, true).await?;
-
-            let belongs_to = fastn_core::user_group::belongs_to(
-                self,
-                document_readers.as_slice(),
-                access_identities.iter().collect_vec().as_slice(),
-            )?;
-
-            if with_confidential {
-                if belongs_to {
-                    return Ok(true);
-                }
-                return Ok(!confidential);
-            }
-            return Ok(belongs_to);
-        }
-        Ok(true)
-    }
-
-    #[tracing::instrument(skip(req, self))]
-    pub(crate) async fn can_write(
-        &self,
-        req: &fastn_core::http::Request,
-        document_path: &str,
-    ) -> fastn_core::Result<bool> {
-        use itertools::Itertools;
-        let document_name = self.document_name_with_default(document_path);
-        if let Some(sitemap) = &self.package.sitemap {
-            // TODO: This can be buggy in case of: if groups are used directly in sitemap are foreign groups
-            let document_writers = sitemap.writers(document_name.as_str(), &self.package.groups);
-            let access_identities =
-                fastn_core::user_group::access_identities(self, req, &document_name, false).await?;
-
-            return fastn_core::user_group::belongs_to(
-                self,
-                document_writers.as_slice(),
-                access_identities.iter().collect_vec().as_slice(),
-            );
-        }
-
-        Ok(false)
-    }
 }
diff --git a/fastn-core/src/controller.rs b/fastn-core/src/controller.rs
index a39ed203f9..64bdedd650 100644
--- a/fastn-core/src/controller.rs
+++ b/fastn-core/src/controller.rs
@@ -78,7 +78,7 @@ pub async fn resolve_dependencies(
         );
         // Resolve dependencies by reading the FASTN.ftd using config.read()
         // Assuming package_name and repo name are identical
-        fastn_core::Config::read(None, false, None).await?;
+        fastn_core::Config::read(None, false).await?;
     } else {
         return Err(fastn_core::Error::APIResponseError(format!(
             "Package {} Cloning failed: {}",
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index d042ee696b..3c8acac312 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -29,7 +29,7 @@ fn cached_parse(
 pub async fn interpret_helper<'a>(
     name: &str,
     source: &str,
-    lib: &'a mut fastn_core::Library2022,
+    lib: &'a mut fastn_core::Library2022<'_>,
     base_url: &str,
     download_assets: bool,
     line_number: usize,
@@ -39,7 +39,7 @@ pub async fn interpret_helper<'a>(
     let mut s = ftd::interpreter::interpret_with_line_number(name, doc, line_number)?;
     lib.module_package_map.insert(
         name.trim_matches('/').to_string(),
-        lib.config.package.name.to_string(),
+        lib.config.config.package.name.to_string(),
     );
     let document;
     loop {
@@ -113,7 +113,7 @@ pub async fn interpret_helper<'a>(
 }
 
 pub async fn resolve_import<'a>(
-    lib: &'a mut fastn_core::Library2,
+    lib: &'a mut fastn_core::Library2<'_>,
     state: &mut ftd::ftd2021::InterpreterState,
     module: &str,
 ) -> ftd::ftd2021::p1::Result<String> {
@@ -138,6 +138,7 @@ pub async fn resolve_import<'a>(
                 if module.starts_with(alias) {
                     lib.push_package_under_process(package).await?;
                     font_ftd = lib
+                        .config
                         .config
                         .all_packages
                         .borrow()
@@ -159,7 +160,7 @@ pub async fn resolve_import<'a>(
 
 // source, foreign_variable, foreign_function
 pub async fn resolve_import_2022<'a>(
-    lib: &'a mut fastn_core::Library2022,
+    lib: &'a mut fastn_core::Library2022<'_>,
     _state: &mut ftd::interpreter::InterpreterState,
     module: &str,
     caller_module: &str,
@@ -227,6 +228,7 @@ pub async fn resolve_import_2022<'a>(
                 if module.starts_with(alias) {
                     lib.push_package_under_process(module, package).await?;
                     font_ftd = lib
+                        .config
                         .config
                         .all_packages
                         .borrow()
@@ -289,7 +291,7 @@ pub async fn resolve_import_2022<'a>(
 pub async fn resolve_foreign_variable2022(
     variable: &str,
     doc_name: &str,
-    lib: &mut fastn_core::Library2022,
+    lib: &mut fastn_core::Library2022<'_>,
     base_url: &str,
     download_assets: bool,
     caller_module: &str,
@@ -322,6 +324,7 @@ pub async fn resolve_foreign_variable2022(
             if alias.eq(&package_name) {
                 lib.push_package_under_process(doc_name, package).await?;
                 let package = lib
+                    .config
                     .config
                     .all_packages
                     .borrow()
@@ -350,7 +353,7 @@ pub async fn resolve_foreign_variable2022(
         module: &str,
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2022,
+        lib: &mut fastn_core::Library2022<'_>,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::interpreter::Value> {
@@ -405,7 +408,11 @@ pub async fn resolve_foreign_variable2022(
                         })?;
                     print!("Processing {}/{} ... ", package.name.as_str(), light_path);
                     fastn_core::utils::write(
-                        &lib.config.build_dir().join("-").join(package.name.as_str()),
+                        &lib.config
+                            .config
+                            .build_dir()
+                            .join("-")
+                            .join(package.name.as_str()),
                         light_path.as_str(),
                         light.as_slice(),
                     )
@@ -459,7 +466,11 @@ pub async fn resolve_foreign_variable2022(
                     {
                         print!("Processing {}/{} ... ", package.name.as_str(), dark_path);
                         fastn_core::utils::write(
-                            &lib.config.build_dir().join("-").join(package.name.as_str()),
+                            &lib.config
+                                .config
+                                .build_dir()
+                                .join("-")
+                                .join(package.name.as_str()),
                             dark_path.as_str(),
                             dark.as_slice(),
                         )
@@ -536,7 +547,7 @@ pub async fn resolve_foreign_variable2022(
 }
 
 async fn download(
-    lib: &mut fastn_core::Library2022,
+    lib: &mut fastn_core::Library2022<'_>,
     download_assets: bool,
     package: &fastn_core::Package,
     path: &str,
@@ -558,7 +569,11 @@ async fn download(
             })?;
         print!("Processing {}/{} ... ", package.name, path);
         fastn_core::utils::write(
-            &lib.config.build_dir().join("-").join(package.name.as_str()),
+            &lib.config
+                .config
+                .build_dir()
+                .join("-")
+                .join(package.name.as_str()),
             path,
             data.as_slice(),
         )
@@ -585,7 +600,7 @@ pub async fn resolve_foreign_variable2(
     variable: &str,
     doc_name: &str,
     state: &ftd::ftd2021::InterpreterState,
-    lib: &mut fastn_core::Library2,
+    lib: &mut fastn_core::Library2<'_>,
     base_url: &str,
     download_assets: bool,
 ) -> ftd::ftd2021::p1::Result<ftd::Value> {
@@ -680,7 +695,11 @@ pub async fn resolve_foreign_variable2(
                         })?;
                     print!("Processing {}/{} ... ", package.name.as_str(), light_path);
                     fastn_core::utils::write(
-                        &lib.config.build_dir().join("-").join(package.name.as_str()),
+                        &lib.config
+                            .config
+                            .build_dir()
+                            .join("-")
+                            .join(package.name.as_str()),
                         light_path.as_str(),
                         light.as_slice(),
                     )
@@ -735,7 +754,11 @@ pub async fn resolve_foreign_variable2(
                     {
                         print!("Processing {}/{} ... ", package.name.as_str(), dark_path);
                         fastn_core::utils::write(
-                            &lib.config.build_dir().join("-").join(package.name.as_str()),
+                            &lib.config
+                                .config
+                                .build_dir()
+                                .join("-")
+                                .join(package.name.as_str()),
                             dark_path.as_str(),
                             dark.as_slice(),
                         )
diff --git a/fastn-core/src/http.rs b/fastn-core/src/http.rs
index 6dbb9131c7..5364bfeb79 100644
--- a/fastn-core/src/http.rs
+++ b/fastn-core/src/http.rs
@@ -90,6 +90,12 @@ pub struct Request {
     // path_params: Vec<(String, )>
 }
 
+impl Default for Request {
+    fn default() -> Self {
+        todo!()
+    }
+}
+
 impl Request {
     //pub fn get_named_params() -> {}
     pub fn from_actix(req: actix_web::HttpRequest, body: actix_web::web::Bytes) -> Self {
diff --git a/fastn-core/src/lib.rs b/fastn-core/src/lib.rs
index e3060da394..15e4f28694 100644
--- a/fastn-core/src/lib.rs
+++ b/fastn-core/src/lib.rs
@@ -44,7 +44,7 @@ pub use commands::{
     start_tracking::start_tracking, status::status, sync2::sync2,
     translation_status::translation_status, update::update,
 };
-pub use config::{Config, FTDEdition};
+pub use config::{Config, FTDEdition, RequestConfig};
 pub use error::Error;
 pub use file::File;
 pub(crate) use file::{get_file, paths_to_files, Document, Static};
diff --git a/fastn-core/src/library/document.rs b/fastn-core/src/library/document.rs
index 9679c9d811..9b11b80958 100644
--- a/fastn-core/src/library/document.rs
+++ b/fastn-core/src/library/document.rs
@@ -44,10 +44,10 @@ pub fn convert_to_document_id(doc_name: &str) -> String {
 }
 
 pub fn document_full_id(
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
     doc: &ftd::ftd2021::p2::TDoc,
 ) -> ftd::ftd2021::p1::Result<String> {
-    let full_document_id = config.doc_id().unwrap_or_else(|| {
+    let full_document_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
             .replace(config.package.name.as_str(), "")
@@ -60,93 +60,93 @@ pub fn document_full_id(
     Ok(format!("/{}/", full_document_id.trim_matches('/')))
 }
 
-#[allow(dead_code)]
-pub mod processor {
-    pub fn document_id(
-        _section: &ftd::ftd2021::p1::Section,
-        doc: &ftd::ftd2021::p2::TDoc,
-        config: &fastn_core::Config,
-    ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        let doc_id = config.doc_id().unwrap_or_else(|| {
-            doc.name
-                .to_string()
-                .replace(config.package.name.as_str(), "")
-        });
-
-        let document_id = doc_id
-            .split_once("/-/")
-            .map(|x| x.0)
-            .unwrap_or_else(|| &doc_id)
-            .trim_matches('/');
-
-        Ok(ftd::Value::String {
-            text: format!("/{}/", document_id),
-            source: ftd::TextSource::Default,
-        })
-    }
-    pub fn document_full_id(
-        _section: &ftd::ftd2021::p1::Section,
-        doc: &ftd::ftd2021::p2::TDoc,
-        config: &fastn_core::Config,
-    ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        Ok(ftd::Value::String {
-            text: super::document_full_id(config, doc)?,
-            source: ftd::TextSource::Default,
-        })
-    }
-
-    pub async fn document_name<'a>(
-        section: &ftd::ftd2021::p1::Section,
-        doc: &ftd::ftd2021::p2::TDoc<'a>,
-        config: &fastn_core::Config,
-    ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        let doc_id = config.doc_id().unwrap_or_else(|| {
-            doc.name
-                .to_string()
-                .replace(config.package.name.as_str(), "")
-        });
-
-        let file_path = config.get_file_path(&doc_id).await.map_err(|e| {
-            ftd::ftd2021::p1::Error::ParseError {
-                message: e.to_string(),
-                doc_id: doc.name.to_string(),
-                line_number: section.line_number,
-            }
-        })?;
-
-        Ok(ftd::Value::String {
-            text: file_path.trim().to_string(),
-            source: ftd::TextSource::Default,
-        })
-    }
-
-    pub fn document_suffix(
-        _section: &ftd::ftd2021::p1::Section,
-        doc: &ftd::ftd2021::p2::TDoc,
-        config: &fastn_core::Config,
-    ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        let doc_id = config.doc_id().unwrap_or_else(|| {
-            doc.name
-                .to_string()
-                .replace(config.package.name.as_str(), "")
-        });
-
-        let value = doc_id
-            .split_once("/-/")
-            .map(|(_, y)| y.trim().to_string())
-            .map(|suffix| ftd::Value::String {
-                text: suffix,
-                source: ftd::TextSource::Default,
-            });
-
-        Ok(ftd::Value::Optional {
-            data: Box::new(value),
-            kind: ftd::ftd2021::p2::Kind::String {
-                caption: false,
-                body: false,
-                default: None,
-                is_reference: false,
-            },
-        })
-    }
-}
+// #[allow(dead_code)]
+// pub mod processor {
+//     pub fn document_id(
+//         _section: &ftd::ftd2021::p1::Section,
+//         doc: &ftd::ftd2021::p2::TDoc,
+//         config: &fastn_core::Config,
+//     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
+//         let doc_id = config.doc_id().unwrap_or_else(|| {
+//             doc.name
+//                 .to_string()
+//                 .replace(config.package.name.as_str(), "")
+//         });
+//
+//         let document_id = doc_id
+//             .split_once("/-/")
+//             .map(|x| x.0)
+//             .unwrap_or_else(|| &doc_id)
+//             .trim_matches('/');
+//
+//         Ok(ftd::Value::String {
+//             text: format!("/{}/", document_id),
+//             source: ftd::TextSource::Default,
+//         })
+//     }
+//     pub fn document_full_id(
+//         _section: &ftd::ftd2021::p1::Section,
+//         doc: &ftd::ftd2021::p2::TDoc,
+//         config: &fastn_core::Config,
+//     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
+//         Ok(ftd::Value::String {
+//             text: super::document_full_id(config, doc)?,
+//             source: ftd::TextSource::Default,
+//         })
+//     }
+//
+//     pub async fn document_name<'a>(
+//         section: &ftd::ftd2021::p1::Section,
+//         doc: &ftd::ftd2021::p2::TDoc<'a>,
+//         config: &fastn_core::Config,
+//     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
+//         let doc_id = config.doc_id().unwrap_or_else(|| {
+//             doc.name
+//                 .to_string()
+//                 .replace(config.package.name.as_str(), "")
+//         });
+//
+//         let file_path = config.get_file_path(&doc_id).await.map_err(|e| {
+//             ftd::ftd2021::p1::Error::ParseError {
+//                 message: e.to_string(),
+//                 doc_id: doc.name.to_string(),
+//                 line_number: section.line_number,
+//             }
+//         })?;
+//
+//         Ok(ftd::Value::String {
+//             text: file_path.trim().to_string(),
+//             source: ftd::TextSource::Default,
+//         })
+//     }
+//
+//     pub fn document_suffix(
+//         _section: &ftd::ftd2021::p1::Section,
+//         doc: &ftd::ftd2021::p2::TDoc,
+//         req_config: &fastn_core::RequestConfig,
+//     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
+//         let doc_id = req_config.config.doc_id().unwrap_or_else(|| {
+//             doc.name
+//                 .to_string()
+//                 .replace(config.package.name.as_str(), "")
+//         });
+//
+//         let value = doc_id
+//             .split_once("/-/")
+//             .map(|(_, y)| y.trim().to_string())
+//             .map(|suffix| ftd::Value::String {
+//                 text: suffix,
+//                 source: ftd::TextSource::Default,
+//             });
+//
+//         Ok(ftd::Value::Optional {
+//             data: Box::new(value),
+//             kind: ftd::ftd2021::p2::Kind::String {
+//                 caption: false,
+//                 body: false,
+//                 default: None,
+//                 is_reference: false,
+//             },
+//         })
+//     }
+// }
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index 716674b3fa..f34e9b8b30 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -1,14 +1,14 @@
 use crate::utils::HasElements;
 
 async fn i18n_data(lib: &fastn_core::Library) -> String {
-    let lang = match lib.config.package.language {
+    let lang = match lib.config.config.package.language {
         Some(ref lang) => {
             realm_lang::Language::from_2_letter_code(lang).unwrap_or(realm_lang::Language::English)
         }
         None => realm_lang::Language::English,
     };
 
-    let primary_lang = match lib.config.package.translation_of.as_ref() {
+    let primary_lang = match lib.config.config.package.translation_of.as_ref() {
         Some(ref package) => match package.language {
             Some(ref lang) => realm_lang::Language::from_2_letter_code(lang)
                 .unwrap_or(realm_lang::Language::English),
@@ -19,7 +19,7 @@ async fn i18n_data(lib: &fastn_core::Library) -> String {
 
     let current_document_last_modified_on =
         fastn_core::utils::get_current_document_last_modified_on(
-            &lib.config,
+            &lib.config.config,
             lib.document_id.as_str(),
         )
         .await;
@@ -261,14 +261,14 @@ pub(crate) async fn get2022_(lib: &fastn_core::Library) -> String {
         capital_fastn = capital_fastn(lib),
         build_info = construct_fastn_cli_variables(lib),
         document_id = lib.document_id,
-        title = lib.config.package.name,
-        package_name = lib.config.package.name,
-        home_url = format!("https://{}", lib.config.package.name),
+        title = lib.config.config.package.name,
+        package_name = lib.config.config.package.name,
+        home_url = format!("https://{}", lib.config.config.package.name),
     );
 
-    if let Ok(number_of_documents) =
-        futures::executor::block_on(fastn_core::utils::get_number_of_documents(&lib.config))
-    {
+    if let Ok(number_of_documents) = futures::executor::block_on(
+        fastn_core::utils::get_number_of_documents(&lib.config.config),
+    ) {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -323,12 +323,12 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         i18n_data = i18n_data(lib).await,
         build_info = construct_fastn_cli_variables(lib),
         document_id = lib.document_id,
-        title = lib.config.package.name,
-        package_name = lib.config.package.name,
-        home_url = format!("https://{}", lib.config.package.name),
+        title = lib.config.config.package.name,
+        package_name = lib.config.config.package.name,
+        home_url = format!("https://{}", lib.config.config.package.name),
     );
 
-    if lib.config.package.translation_of.is_some() {
+    if lib.config.config.package.translation_of.is_some() {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -339,7 +339,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if lib.config.package.translations.has_elements() {
+    if lib.config.config.package.translations.has_elements() {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -350,7 +350,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if let Some(ref zip) = lib.config.package.zip {
+    if let Some(ref zip) = lib.config.config.package.zip {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -390,7 +390,8 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if lib.config.package.translation_of.is_some() || lib.config.package.translations.has_elements()
+    if lib.config.config.package.translation_of.is_some()
+        || lib.config.config.package.translations.has_elements()
     {
         fastn_base = format!(
             indoc::indoc! {"
@@ -400,13 +401,13 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
 
             "},
             fastn_base = fastn_base,
-            package_name = lib.config.package.name,
+            package_name = lib.config.config.package.name,
         );
     }
 
-    if let Ok(number_of_documents) =
-        futures::executor::block_on(fastn_core::utils::get_number_of_documents(&lib.config))
-    {
+    if let Ok(number_of_documents) = futures::executor::block_on(
+        fastn_core::utils::get_number_of_documents(&lib.config.config),
+    ) {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -418,9 +419,9 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if let Some(last_modified_on) =
-        futures::executor::block_on(fastn_core::utils::get_last_modified_on(&lib.config.root))
-    {
+    if let Some(last_modified_on) = futures::executor::block_on(
+        fastn_core::utils::get_last_modified_on(&lib.config.config.root),
+    ) {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -434,7 +435,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
 
     if let Some(last_modified_on) =
         futures::executor::block_on(fastn_core::utils::get_current_document_last_modified_on(
-            &lib.config,
+            &lib.config.config,
             lib.document_id.as_str(),
         ))
     {
@@ -449,7 +450,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if let Some(ref language) = lib.config.package.language {
+    if let Some(ref language) = lib.config.config.package.language {
         fastn_base = format!(
             indoc::indoc! {"
                 {fastn_base}
@@ -519,7 +520,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         );
     }
 
-    if let Ok(original_path) = lib.config.original_path() {
+    if let Ok(original_path) = lib.config.config.original_path() {
         let base_url = lib
             .base_url
             .as_str()
@@ -537,7 +538,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
             if let Ok(translation_status) =
                 fastn_core::commands::translation_status::get_translation_status(
                     &original_snapshots,
-                    &lib.config.root,
+                    &lib.config.config.root,
                 )
             {
                 let mut never_marked_files = "".to_string();
@@ -681,9 +682,9 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
         }
     }
 
-    if lib.config.package.translations.has_elements() {
+    if lib.config.config.package.translations.has_elements() {
         let mut translation_status_list = "".to_string();
-        for translation in lib.config.package.translations.iter() {
+        for translation in lib.config.config.package.translations.iter() {
             if let Some(ref status) = translation.translation_status_summary {
                 if let Some(ref language) = translation.language {
                     let url = format!("https://{}/-/translation-status/", translation.name);
@@ -742,7 +743,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
     }
 
     let other_language_packages =
-        if let Some(translation_of) = lib.config.package.translation_of.as_ref() {
+        if let Some(translation_of) = lib.config.config.package.translation_of.as_ref() {
             let mut other_language_packages = translation_of
                 .translations
                 .iter()
@@ -751,6 +752,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
             other_language_packages
         } else {
             lib.config
+                .config
                 .package
                 .translations
                 .iter()
@@ -839,14 +841,14 @@ fn capital_fastn(lib: &fastn_core::Library) -> String {
         indoc::indoc! {"
             -- package-data package: {package_name}
         "},
-        package_name = lib.config.package.name,
+        package_name = lib.config.config.package.name,
     );
 
-    if let Some(ref zip) = lib.config.package.zip {
+    if let Some(ref zip) = lib.config.config.package.zip {
         s.push_str(format!("zip: {}", zip).as_str());
     }
 
-    if let Some(ref favicon) = lib.config.package.favicon {
+    if let Some(ref favicon) = lib.config.config.package.favicon {
         s.push_str(format!("\nfavicon: {}", favicon).as_str());
     }
 
diff --git a/fastn-core/src/library/mod.rs b/fastn-core/src/library/mod.rs
index 42df90e8fa..ffa1f707c6 100644
--- a/fastn-core/src/library/mod.rs
+++ b/fastn-core/src/library/mod.rs
@@ -6,8 +6,8 @@ pub(crate) mod toc;
 pub use fastn_core::Library2022;
 
 #[derive(Debug)]
-pub struct Library {
-    pub config: fastn_core::Config,
+pub struct Library<'a> {
+    pub config: fastn_core::RequestConfig<'a>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -58,7 +58,7 @@ impl Library {
 
             for (alias, package) in package.to_owned().aliases() {
                 if name.starts_with(alias) {
-                    let package = lib.config.resolve_package(package).await.ok()?;
+                    let package = lib.config.config.resolve_package(package).await.ok()?;
                     if let Some(r) = get_data_from_package(
                         name.replacen(alias, &package.name, 1).as_str(),
                         &package,
@@ -122,8 +122,8 @@ impl Library {
             package: &fastn_core::Package,
             lib: &Library,
         ) -> Option<String> {
-            let path = lib.config.get_root_for_package(package);
-            fastn_core::Config::download_required_file(&lib.config.root, name, package)
+            let path = lib.config.config.get_root_for_package(package);
+            fastn_core::Config::download_required_file(&lib.config.config.root, name, package)
                 .await
                 .ok()?;
             // Explicit check for the current package.
@@ -147,8 +147,8 @@ impl Library {
 }
 
 #[derive(Debug)]
-pub struct Library2 {
-    pub config: fastn_core::Config,
+pub struct Library2<'a> {
+    pub config: fastn_core::RequestConfig<'a>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -165,6 +165,7 @@ impl Library2 {
     ) -> ftd::ftd2021::p1::Result<()> {
         self.packages_under_process.push(package.name.to_string());
         if self
+            .config
             .config
             .all_packages
             .borrow()
@@ -173,15 +174,19 @@ impl Library2 {
             return Ok(());
         }
 
-        let package = self.config.resolve_package(package).await.map_err(|_| {
-            ftd::ftd2021::p1::Error::ParseError {
+        let package = self
+            .config
+            .config
+            .resolve_package(package)
+            .await
+            .map_err(|_| ftd::ftd2021::p1::Error::ParseError {
                 message: format!("Cannot resolve the package: {}", package.name),
                 doc_id: self.document_id.to_string(),
                 line_number: 0,
-            }
-        })?;
+            })?;
 
         self.config
+            .config
             .all_packages
             .borrow_mut()
             .insert(package.name.to_string(), package);
@@ -198,6 +203,7 @@ impl Library2 {
         })?;
 
         self.config
+            .config
             .all_packages
             .borrow()
             .get(current_package_name)
@@ -288,7 +294,7 @@ impl Library2 {
             lib: &mut Library2,
         ) -> Option<String> {
             lib.push_package_under_process(package).await.ok()?;
-            let packages = lib.config.all_packages.borrow();
+            let packages = lib.config.config.all_packages.borrow();
             let package = packages.get(package.name.as_str()).unwrap_or(package);
             // Explicit check for the current package.
             if !name.starts_with(package.name.as_str()) {
@@ -296,7 +302,11 @@ impl Library2 {
             }
             let new_name = name.replacen(package.name.as_str(), "", 1);
             let (file_path, data) = package
-                .resolve_by_id(new_name.as_str(), None, lib.config.package.name.as_str())
+                .resolve_by_id(
+                    new_name.as_str(),
+                    None,
+                    lib.config.config.package.name.as_str(),
+                )
                 .await
                 .ok()?;
             if !file_path.ends_with(".ftd") {
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 586f5910f9..5a6eeae962 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -14,8 +14,8 @@ impl KeyValueData {
 }
 
 #[derive(Debug)]
-pub struct Library2022 {
-    pub config: fastn_core::Config,
+pub struct Library2022<'a> {
+    pub config: fastn_core::RequestConfig<'a>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -52,6 +52,7 @@ impl Library2022 {
             })?;
 
         self.config
+            .config
             .all_packages
             .borrow()
             .get(current_package_name)
@@ -152,7 +153,7 @@ impl Library2022 {
             lib: &mut fastn_core::Library2022,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
-            let packages = lib.config.all_packages.borrow();
+            let packages = lib.config.config.all_packages.borrow();
             let package = packages.get(package.name.as_str()).unwrap_or(package);
             // Explicit check for the current package.
             let name = format!("{}/", name.trim_end_matches('/'));
@@ -161,7 +162,11 @@ impl Library2022 {
             }
             let new_name = name.replacen(package.name.as_str(), "", 1);
             let (file_path, data) = package
-                .resolve_by_id(new_name.as_str(), None, lib.config.package.name.as_str())
+                .resolve_by_id(
+                    new_name.as_str(),
+                    None,
+                    lib.config.config.package.name.as_str(),
+                )
                 .await
                 .ok()?;
             if !file_path.ends_with(".ftd") {
@@ -186,6 +191,7 @@ impl Library2022 {
             package.name.to_string(),
         );
         if self
+            .config
             .config
             .all_packages
             .borrow()
@@ -194,15 +200,19 @@ impl Library2022 {
             return Ok(());
         }
 
-        let package = self.config.resolve_package(package).await.map_err(|_| {
-            ftd::ftd2021::p1::Error::ParseError {
+        let package = self
+            .config
+            .config
+            .resolve_package(package)
+            .await
+            .map_err(|_| ftd::ftd2021::p1::Error::ParseError {
                 message: format!("Cannot resolve the package: {}", package.name),
                 doc_id: self.document_id.to_string(),
                 line_number: 0,
-            }
-        })?;
+            })?;
 
         self.config
+            .config
             .all_packages
             .borrow_mut()
             .insert(package.name.to_string(), package);
@@ -229,15 +239,13 @@ impl Library2022 {
             "figma-typo-token" => {
                 processor::figma_typography_tokens::process_typography_tokens(value, kind, doc)
             }
-            "figma-cs-token" => {
-                processor::figma_tokens::process_figma_tokens(value, kind, doc, &self.config)
-            }
+            "figma-cs-token" => processor::figma_tokens::process_figma_tokens(value, kind, doc),
             "figma-cs-token-old" => {
-                processor::figma_tokens::process_figma_tokens_old(value, kind, doc, &self.config)
+                processor::figma_tokens::process_figma_tokens_old(value, kind, doc)
             }
             "http" => processor::http::process(value, kind, doc, &self.config).await,
             "tutor" => fastn_core::tutor::process(value, kind, doc).await,
-            "toc" => processor::toc::process(value, kind, doc, &self.config),
+            "toc" => processor::toc::process(value, kind, doc),
             "get-data" => processor::get_data::process(value, kind, doc, &self.config),
             "sitemap" => processor::sitemap::process(value, kind, doc, &self.config),
             "full-sitemap" => {
@@ -284,7 +292,7 @@ impl Library2022 {
             "package-query" => processor::sqlite::process(value, kind, doc, &self.config).await,
             "pg" => processor::pg::process(value, kind, doc).await,
             "package-tree" => {
-                processor::package_tree::process(value, kind, doc, &self.config).await
+                processor::package_tree::process(value, kind, doc, &self.config.config).await
             }
             "query" => {
                 processor::query::process(
diff --git a/fastn-core/src/library2022/processor/apps.rs b/fastn-core/src/library2022/processor/apps.rs
index b56b9a2456..d82c52d877 100644
--- a/fastn-core/src/library2022/processor/apps.rs
+++ b/fastn-core/src/library2022/processor/apps.rs
@@ -2,7 +2,7 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
     #[derive(Debug, serde::Serialize)]
@@ -14,7 +14,8 @@ pub fn process(
         icon: Option<ftd::ImageSrc>,
     }
 
-    let apps = config
+    let apps = req_config
+        .config
         .package
         .apps
         .iter()
diff --git a/fastn-core/src/library2022/processor/document.rs b/fastn-core/src/library2022/processor/document.rs
index e28b83ae68..3fe69ba3ed 100644
--- a/fastn-core/src/library2022/processor/document.rs
+++ b/fastn-core/src/library2022/processor/document.rs
@@ -2,7 +2,7 @@ pub fn process_readers(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
     document_id: &str,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
@@ -17,9 +17,9 @@ pub fn process_readers(
         .get_optional_string_by_key("document", doc.name, value.line_number())?
         .unwrap_or_else(|| document_id.to_string());
 
-    let document_name = config.document_name_with_default(document.as_str());
+    let document_name = req_config.document_name_with_default(document.as_str());
 
-    let readers = match config.package.sitemap.as_ref() {
+    let readers = match req_config.config.package.sitemap.as_ref() {
         Some(s) => s
             .readers(document_name.as_str(), &config.package.groups)
             .0
@@ -36,7 +36,7 @@ pub fn process_writers(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
     document_id: &str,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
@@ -52,8 +52,8 @@ pub fn process_writers(
         .get_optional_string_by_key("document", doc.name, value.line_number())?
         .unwrap_or_else(|| document_id.to_string());
 
-    let document_name = config.document_name_with_default(document.as_str());
-    let writers = match config.package.sitemap.as_ref() {
+    let document_name = req_config.document_name_with_default(document.as_str());
+    let writers = match req_config.config.package.sitemap.as_ref() {
         Some(s) => s
             .writers(document_name.as_str(), &config.package.groups)
             .into_iter()
@@ -69,12 +69,12 @@ pub fn document_id(
     _value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    let doc_id = config.doc_id().unwrap_or_else(|| {
+    let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
-            .replace(config.package.name.as_str(), "")
+            .replace(req_config.config.package.name.as_str(), "")
     });
 
     let document_id = doc_id
@@ -98,10 +98,10 @@ pub fn document_full_id(
     _value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     Ok(ftd::interpreter::Value::String {
-        text: fastn_core::library2022::utils::document_full_id(config, doc)?,
+        text: fastn_core::library2022::utils::document_full_id(req_config, doc)?,
     })
 }
 
@@ -109,9 +109,9 @@ pub fn document_suffix(
     _value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    let doc_id = config.doc_id().unwrap_or_else(|| {
+    let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
             .replace(config.package.name.as_str(), "")
@@ -136,23 +136,23 @@ pub async fn document_name<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    let doc_id = config.doc_id().unwrap_or_else(|| {
+    let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
             .replace(config.package.name.as_str(), "")
     });
 
-    let file_path =
-        config
-            .get_file_path(&doc_id)
-            .await
-            .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
-                message: e.to_string(),
-                doc_id: doc.name.to_string(),
-                line_number: value.line_number(),
-            })?;
+    let file_path = req_config
+        .config
+        .get_file_path(&doc_id)
+        .await
+        .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
+            message: e.to_string(),
+            doc_id: doc.name.to_string(),
+            line_number: value.line_number(),
+        })?;
 
     Ok(ftd::interpreter::Value::String {
         text: file_path.trim().to_string(),
diff --git a/fastn-core/src/library2022/processor/fetch_file.rs b/fastn-core/src/library2022/processor/fetch_file.rs
index 216511cbcc..74d8251104 100644
--- a/fastn-core/src/library2022/processor/fetch_file.rs
+++ b/fastn-core/src/library2022/processor/fetch_file.rs
@@ -2,7 +2,7 @@ pub async fn fetch_files(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     if !kind.is_string() {
         return ftd::interpreter::utils::e2(
@@ -24,7 +24,7 @@ pub async fn fetch_files(
         })?;
 
     Ok(ftd::interpreter::Value::String {
-        text: tokio::fs::read_to_string(config.root.join(path))
+        text: tokio::fs::read_to_string(req_config.config.root.join(path))
             .await
             .map_err(|v| ftd::interpreter::Error::ParseError {
                 message: v.to_string(),
diff --git a/fastn-core/src/library2022/processor/figma_tokens.rs b/fastn-core/src/library2022/processor/figma_tokens.rs
index c1669874f9..1403396cc1 100644
--- a/fastn-core/src/library2022/processor/figma_tokens.rs
+++ b/fastn-core/src/library2022/processor/figma_tokens.rs
@@ -4,7 +4,6 @@ pub fn process_figma_tokens(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &mut ftd::interpreter::TDoc,
-    _config: &fastn_core::Config,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let line_number = value.line_number();
     let mut variable_name: Option<String> = None;
@@ -47,7 +46,6 @@ pub fn process_figma_tokens_old(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &mut ftd::interpreter::TDoc,
-    _config: &fastn_core::Config,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let line_number = value.line_number();
     let mut variable_name: Option<String> = None;
diff --git a/fastn-core/src/library2022/processor/get_data.rs b/fastn-core/src/library2022/processor/get_data.rs
index 0e83251ba6..b00845230c 100644
--- a/fastn-core/src/library2022/processor/get_data.rs
+++ b/fastn-core/src/library2022/processor/get_data.rs
@@ -2,7 +2,7 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (section_name, headers, body, line_number) = match value.get_record(doc.name) {
         Ok(val) => (
@@ -30,7 +30,7 @@ pub fn process(
         });
     }
 
-    if let Some(data) = config.extra_data.get(key.as_str()) {
+    if let Some(data) = req_config.extra_data.get(key.as_str()) {
         return match kind {
             ftd::interpreter::Kind::Integer => {
                 let value2 =
diff --git a/fastn-core/src/library2022/processor/http.rs b/fastn-core/src/library2022/processor/http.rs
index 20237911fb..1a8d4ac760 100644
--- a/fastn-core/src/library2022/processor/http.rs
+++ b/fastn-core/src/library2022/processor/http.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, line_number) = if let Ok(val) = value.get_record(doc.name) {
         (val.2.to_owned(), val.5.to_owned())
@@ -57,11 +57,13 @@ pub async fn process(
         }
     };
 
-    let (_, mut url, conf) = fastn_core::config::utils::get_clean_url(config, url.as_str())
-        .map_err(|e| ftd::interpreter::Error::ParseError {
-            message: format!("invalid url: {:?}", e),
-            doc_id: doc.name.to_string(),
-            line_number,
+    let (_, mut url, conf) =
+        fastn_core::config::utils::get_clean_url(req_config.config, url.as_str()).map_err(|e| {
+            ftd::interpreter::Error::ParseError {
+                message: format!("invalid url: {:?}", e),
+                doc_id: doc.name.to_string(),
+                line_number,
+            }
         })?;
 
     let mut body = vec![];
@@ -104,7 +106,7 @@ pub async fn process(
     let response = if method.as_str().eq("post") {
         fastn_core::http::http_post_with_cookie(
             url.as_str(),
-            config.request.as_ref().and_then(|v| v.cookies_string()),
+            req_config.request.cookies_string(),
             &conf,
             dbg!(format!("{{{}}}", body.join(","))).as_str(),
         )
@@ -112,7 +114,7 @@ pub async fn process(
     } else {
         fastn_core::http::http_get_with_cookie(
             url.as_str(),
-            config.request.as_ref().and_then(|v| v.cookies_string()),
+            req_config.request.cookies_string(),
             &conf,
         )
         .await
diff --git a/fastn-core/src/library2022/processor/query.rs b/fastn-core/src/library2022/processor/query.rs
index a3a07ef93a..8772013360 100644
--- a/fastn-core/src/library2022/processor/query.rs
+++ b/fastn-core/src/library2022/processor/query.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &mut fastn_core::Config,
+    req_config: &mut fastn_core::RequestConfig,
     document_id: &str,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     // TODO: document key should be optional
@@ -20,7 +20,7 @@ pub async fn process(
         .get_optional_string_by_key("stage", doc.name, value.line_number())?
         .unwrap_or_else(|| "ast".to_string());
 
-    let file = config
+    let file = req_config
         .get_file_and_package_by_id(path.as_str())
         .await
         .map_err(|e| ftd::interpreter::Error::ParseError {
diff --git a/fastn-core/src/library2022/processor/request_data.rs b/fastn-core/src/library2022/processor/request_data.rs
index b581f94a31..1df3663eef 100644
--- a/fastn-core/src/library2022/processor/request_data.rs
+++ b/fastn-core/src/library2022/processor/request_data.rs
@@ -2,27 +2,11 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    let req = match config.request.as_ref() {
-        Some(v) => v,
-        None if kind.is_optional() => {
-            return Ok(ftd::interpreter::Value::Optional {
-                data: Box::new(None),
-                kind: kind.into_kind_data(),
-            });
-        }
-        None => {
-            return ftd::interpreter::utils::e2(
-                "config does not contain http-request object",
-                doc.name,
-                value.line_number(),
-            )
-        }
-    };
-    let mut data = req.query().clone();
+    let mut data = req_config.request.query().clone();
 
-    for (name, param_value) in config.named_parameters.iter() {
+    for (name, param_value) in req_config.named_parameters.iter() {
         let json_value =
             param_value
                 .to_serde_value()
@@ -34,7 +18,7 @@ pub fn process(
         data.insert(name.to_string(), json_value);
     }
 
-    match req.body_as_json() {
+    match req_config.request.body_as_json() {
         Ok(Some(b)) => {
             data.extend(b);
         }
@@ -49,7 +33,7 @@ pub fn process(
     }
 
     data.extend(
-        config
+        req_config
             .extra_data
             .iter()
             .map(|(k, v)| (k.to_string(), serde_json::Value::String(v.to_string()))),
diff --git a/fastn-core/src/library2022/processor/sitemap.rs b/fastn-core/src/library2022/processor/sitemap.rs
index f4edd4409e..b441563cce 100644
--- a/fastn-core/src/library2022/processor/sitemap.rs
+++ b/fastn-core/src/library2022/processor/sitemap.rs
@@ -2,10 +2,10 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    if let Some(ref sitemap) = config.package.sitemap {
-        let doc_id = config
+    if let Some(ref sitemap) = req_config.config.package.sitemap {
+        let doc_id = req_config
             .current_document
             .clone()
             .map(|v| fastn_core::utils::id_to_path(v.as_str()))
@@ -32,10 +32,10 @@ pub fn full_sitemap_process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     if let Some(ref sitemap) = config.package.sitemap {
-        let doc_id = config
+        let doc_id = req_config
             .current_document
             .clone()
             .map(|v| fastn_core::utils::id_to_path(v.as_str()))
diff --git a/fastn-core/src/library2022/processor/sqlite.rs b/fastn-core/src/library2022/processor/sqlite.rs
index e243bed728..5b5af34e58 100644
--- a/fastn-core/src/library2022/processor/sqlite.rs
+++ b/fastn-core/src/library2022/processor/sqlite.rs
@@ -28,7 +28,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, query) = get_p1_data("package-data", &value, doc.name)?;
 
@@ -45,7 +45,12 @@ pub async fn process(
         };
     let mut sqlite_database_path = camino::Utf8PathBuf::new().join(sqlite_database.as_str());
     if !sqlite_database_path.exists() {
-        if !config.root.join(sqlite_database_path.as_path()).exists() {
+        if !req_config
+            .config
+            .root
+            .join(sqlite_database_path.as_path())
+            .exists()
+        {
             return ftd::interpreter::utils::e2(
                 "`db` does not exists for package-query processor".to_string(),
                 doc.name,
diff --git a/fastn-core/src/library2022/processor/toc.rs b/fastn-core/src/library2022/processor/toc.rs
index ae2daad439..de794359b5 100644
--- a/fastn-core/src/library2022/processor/toc.rs
+++ b/fastn-core/src/library2022/processor/toc.rs
@@ -2,7 +2,6 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    _config: &fastn_core::Config,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (body, line_number) = if let Ok(val) = value.get_record(doc.name) {
         (val.3.to_owned(), val.5.to_owned())
diff --git a/fastn-core/src/library2022/processor/user_details.rs b/fastn-core/src/library2022/processor/user_details.rs
index 4860cb91d5..58f12877ae 100644
--- a/fastn-core/src/library2022/processor/user_details.rs
+++ b/fastn-core/src/library2022/processor/user_details.rs
@@ -2,20 +2,17 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let mut found_cookie = false;
-    let is_login = match &config.request {
-        Some(req) => {
-            for auth_provider in fastn_core::auth::AuthProviders::AUTH_ITER.iter() {
-                if req.cookie(auth_provider.as_str()).is_some() {
-                    found_cookie = true;
-                    break;
-                }
+    let is_login = {
+        for auth_provider in fastn_core::auth::AuthProviders::AUTH_ITER.iter() {
+            if req_config.request.cookie(auth_provider.as_str()).is_some() {
+                found_cookie = true;
+                break;
             }
-            found_cookie
         }
-        None => false,
+        found_cookie
     };
 
     #[derive(Debug, serde::Serialize)]
diff --git a/fastn-core/src/library2022/processor/user_group.rs b/fastn-core/src/library2022/processor/user_group.rs
index 548cc850d0..17e13a1e2c 100644
--- a/fastn-core/src/library2022/processor/user_group.rs
+++ b/fastn-core/src/library2022/processor/user_group.rs
@@ -2,10 +2,11 @@ pub fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
-    let g = config
+    let g = req_config
+        .config
         .package
         .groups
         .values()
@@ -19,7 +20,7 @@ pub fn process_by_id(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let headers = match value.get_record(doc.name) {
         Ok(val) => val.2.to_owned(),
@@ -37,7 +38,8 @@ pub fn process_by_id(
         }
     };
 
-    let g = config
+    let g = req_config
+        .config
         .package
         .groups
         .get(group_id.as_str())
@@ -56,18 +58,20 @@ pub fn get_identities(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
 
     let doc_id = fastn_core::library2022::utils::document_full_id(config, doc)?;
 
-    let identities = fastn_core::user_group::get_identities(config, doc_id.as_str(), true)
-        .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
-            message: e.to_string(),
-            doc_id,
-            line_number: value.line_number(),
-        })?;
+    let identities =
+        fastn_core::user_group::get_identities(req_config.config, doc_id.as_str(), true).map_err(
+            |e| ftd::ftd2021::p1::Error::ParseError {
+                message: e.to_string(),
+                doc_id,
+                line_number: value.line_number(),
+            },
+        )?;
 
     Ok(ftd::interpreter::Value::List {
         data: identities
@@ -93,17 +97,16 @@ pub async fn is_reader<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let doc_id = fastn_core::library2022::utils::document_full_id(config, doc)?;
-    let is_reader = config
-        .can_read(config.request.as_ref().unwrap(), &doc_id, false)
-        .await
-        .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
+    let is_reader = req_config.can_read(&doc_id, false).await.map_err(|e| {
+        ftd::ftd2021::p1::Error::ParseError {
             message: e.to_string(),
             doc_id,
             line_number: value.line_number(),
-        })?;
+        }
+    })?;
 
     Ok(ftd::interpreter::Value::Boolean { value: is_reader })
 }
diff --git a/fastn-core/src/library2022/utils.rs b/fastn-core/src/library2022/utils.rs
index 2ee2ba5927..6b965ca3eb 100644
--- a/fastn-core/src/library2022/utils.rs
+++ b/fastn-core/src/library2022/utils.rs
@@ -1,8 +1,8 @@
 pub fn document_full_id(
-    config: &fastn_core::Config,
+    req_config: &fastn_core::RequestConfig,
     doc: &ftd::interpreter::TDoc,
 ) -> ftd::ftd2021::p1::Result<String> {
-    let full_document_id = config.doc_id().unwrap_or_else(|| {
+    let full_document_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
             .replace(config.package.name.as_str(), "")
diff --git a/fastn-core/src/package/app.rs b/fastn-core/src/package/app.rs
index 3759801b58..31139ce820 100644
--- a/fastn-core/src/package/app.rs
+++ b/fastn-core/src/package/app.rs
@@ -94,11 +94,12 @@ impl AppTemp {
 }
 
 // Takes the path /-/<package-name>/<remaining>/ or /mount-point/<remaining>/
-pub async fn can_read(config: &fastn_core::Config, path: &str) -> fastn_core::Result<bool> {
+pub async fn can_read(config: &fastn_core::RequestConfig, path: &str) -> fastn_core::Result<bool> {
     use itertools::Itertools;
     // first get the app
-    let readers_groups = if let Some((_, _, _, Some(app))) =
-        config.get_mountpoint_sanitized_path(&config.package, path)
+    let readers_groups = if let Some((_, _, _, Some(app))) = config
+        .config
+        .get_mountpoint_sanitized_path(&config.config.package, path)
     {
         app.readers.clone()
     } else {
@@ -110,6 +111,7 @@ pub async fn can_read(config: &fastn_core::Config, path: &str) -> fastn_core::Re
     }
 
     let user_groups = config
+        .config
         .package
         .groups
         .iter()
@@ -124,17 +126,15 @@ pub async fn can_read(config: &fastn_core::Config, path: &str) -> fastn_core::Re
 
     let mut app_identities = vec![];
     for ug in user_groups.iter() {
-        app_identities.extend(ug.get_identities(config)?)
+        app_identities.extend(ug.get_identities(config.config)?)
     }
 
-    let auth_identities = fastn_core::auth::get_auth_identities(
-        config.request.as_ref().unwrap().cookies(),
-        app_identities.as_slice(),
-    )
-    .await?;
+    let auth_identities =
+        fastn_core::auth::get_auth_identities(config.request.cookies(), app_identities.as_slice())
+            .await?;
 
     return fastn_core::user_group::belongs_to(
-        config,
+        config.config,
         user_groups.as_slice(),
         auth_identities.iter().collect_vec().as_slice(),
     );
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index f7786720db..dc4ef6f3a1 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -364,14 +364,14 @@ impl From<FTDResult> for fastn_core::http::Response {
 
 #[tracing::instrument(skip_all)]
 pub(crate) async fn read_ftd(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
     test: bool,
 ) -> fastn_core::Result<FTDResult> {
     tracing::info!(document = main.id);
-    match config.ftd_edition {
+    match config.config.ftd_edition {
         fastn_core::FTDEdition::FTD2021 => {
             unimplemented!()
         }
@@ -386,17 +386,17 @@ pub(crate) async fn read_ftd(
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
 pub(crate) async fn read_ftd_2022(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
     test: bool,
 ) -> fastn_core::Result<FTDResult> {
     let lib_config = config.clone();
-    let mut all_packages = config.all_packages.borrow_mut();
+    let mut all_packages = config.config.all_packages.borrow_mut();
     let current_package = all_packages
         .get(main.package_name.as_str())
-        .unwrap_or(&config.package);
+        .unwrap_or(&config.config.package);
 
     let mut lib = fastn_core::Library2022 {
         config: lib_config,
@@ -444,10 +444,10 @@ pub(crate) async fn read_ftd_2022(
         .downloaded_assets
         .extend(lib.config.downloaded_assets);
 
-    all_packages.extend(lib.config.all_packages.into_inner());
+    all_packages.extend(lib.config.config.all_packages.into_inner());
     drop(all_packages);
 
-    let font_style = config.get_font_style();
+    let font_style = config.config.get_font_style();
     let file_content = fastn_core::utils::replace_markers_2022(
         fastn_core::ftd_html(),
         html_ui,
@@ -463,16 +463,16 @@ pub(crate) async fn read_ftd_2022(
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
 pub(crate) async fn read_ftd_2023(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
 ) -> fastn_core::Result<FTDResult> {
     let lib_config = config.clone();
-    let mut all_packages = config.all_packages.borrow_mut();
+    let mut all_packages = config.config.all_packages.borrow_mut();
     let current_package = all_packages
         .get(main.package_name.as_str())
-        .unwrap_or(&config.package);
+        .unwrap_or(&config.config.package);
 
     let mut lib = fastn_core::Library2022 {
         config: lib_config,
@@ -514,25 +514,27 @@ pub(crate) async fn read_ftd_2023(
     }
 
     let js_ast_data = ftd::js::document_into_js_ast(main_ftd_doc);
-    let js_document_script =
-        fastn_js::to_js(js_ast_data.asts.as_slice(), config.package.name.as_str());
+    let js_document_script = fastn_js::to_js(
+        js_ast_data.asts.as_slice(),
+        config.config.package.name.as_str(),
+    );
     let js_ftd_script = fastn_js::to_js(
         ftd::js::default_bag_into_js_ast().as_slice(),
-        config.package.name.as_str(),
+        config.config.package.name.as_str(),
     );
     let ssr_body = fastn_js::ssr_with_js_string(
-        &config.package.name,
+        &config.config.package.name,
         format!("{js_ftd_script}\n{js_document_script}").as_str(),
     );
 
-    all_packages.extend(lib.config.all_packages.into_inner());
+    all_packages.extend(lib.config.config.all_packages.into_inner());
     drop(all_packages);
 
     config
         .downloaded_assets
         .extend(lib.config.downloaded_assets);
 
-    let font_style = config.get_font_style();
+    let font_style = config.config.get_font_style();
     let file_content = fastn_core::utils::replace_markers_2023(
         ftd::ftd_js_html(),
         js_document_script.as_str(),
@@ -548,7 +550,7 @@ pub(crate) async fn read_ftd_2023(
 }
 
 pub(crate) async fn process_ftd(
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
@@ -556,7 +558,7 @@ pub(crate) async fn process_ftd(
     file_path: &str,
 ) -> fastn_core::Result<FTDResult> {
     let response = read_ftd(config, main, base_url, build_static_files, test).await?;
-    fastn_core::utils::overwrite(&config.build_dir(), file_path, &response.html()).await?;
+    fastn_core::utils::overwrite(&config.config.build_dir(), file_path, &response.html()).await?;
 
     Ok(response)
 }
diff --git a/fastn-core/src/package/user_group.rs b/fastn-core/src/package/user_group.rs
index de73ca3096..3e984c3054 100644
--- a/fastn-core/src/package/user_group.rs
+++ b/fastn-core/src/package/user_group.rs
@@ -603,9 +603,9 @@ pub mod processor {
     pub fn get_identities(
         section: &ftd::ftd2021::p1::Section,
         doc: &ftd::ftd2021::p2::TDoc,
-        config: &fastn_core::Config,
+        req_config: &fastn_core::RequestConfig,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        let doc_id = fastn_core::library::document::document_full_id(config, doc)?;
+        let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
         let identities = super::get_identities(config, doc_id.as_str(), true).map_err(|e| {
             ftd::ftd2021::p1::Error::ParseError {
                 message: e.to_string(),
@@ -641,11 +641,11 @@ pub mod processor {
     pub async fn is_reader<'a>(
         section: &ftd::ftd2021::p1::Section,
         doc: &'a ftd::ftd2021::p2::TDoc<'_>,
-        config: &fastn_core::Config,
+        req_config: &fastn_core::RequestConfig,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
-        let doc_id = fastn_core::library::document::document_full_id(config, doc)?;
+        let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
         let is_reader = config
-            .can_read(config.request.as_ref().unwrap(), &doc_id, false)
+            .can_read(req_config.request, &doc_id, false)
             .await
             .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
                 message: e.to_string(),
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 397f167923..7646fbd3e6 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -6,7 +6,7 @@ pub async fn main(package_name: String) -> fastn_core::Result<()> {
         Some(2000),
         None,
         Some("2023".to_string()),
-        vec!["/-/tutor.js".to_string()],
+        vec![],
         vec![],
         vec![],
         vec![],
diff --git a/fastn-core/src/utils.rs b/fastn-core/src/utils.rs
index e47792bb17..ae66762d9c 100644
--- a/fastn-core/src/utils.rs
+++ b/fastn-core/src/utils.rs
@@ -656,7 +656,7 @@ fn get_extra_css(external_css: &[String], inline_css: &[String], css: &str) -> S
 pub fn replace_markers_2022(
     s: &str,
     html_ui: ftd::html::HtmlUI,
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
     main_id: &str,
     font_style: &str,
     base_url: &str,
@@ -673,14 +673,18 @@ pub fn replace_markers_2022(
         .replace("__ftd_data__", html_ui.variables.as_str())
         .replace(
             "__ftd_canonical_url__",
-            config.package.generate_canonical_url(main_id).as_str(),
+            config
+                .config
+                .package
+                .generate_canonical_url(main_id)
+                .as_str(),
         )
         .replace(
             "__favicon_html_tag__",
             resolve_favicon(
-                config.root.as_str(),
-                config.package.name.as_str(),
-                &config.package.favicon,
+                config.config.root.as_str(),
+                config.config.package.name.as_str(),
+                &config.config.package.favicon,
             )
             .unwrap_or_default()
             .as_str(),
@@ -695,8 +699,8 @@ pub fn replace_markers_2022(
         .replace(
             "__extra_js__",
             get_extra_js(
-                config.ftd_external_js.as_slice(),
-                config.ftd_inline_js.as_slice(),
+                config.config.ftd_external_js.as_slice(),
+                config.config.ftd_inline_js.as_slice(),
                 html_ui.js.as_str(),
                 html_ui.rive_data.as_str(),
             )
@@ -705,8 +709,8 @@ pub fn replace_markers_2022(
         .replace(
             "__extra_css__",
             get_extra_css(
-                config.ftd_external_css.as_slice(),
-                config.ftd_inline_css.as_slice(),
+                config.config.ftd_external_css.as_slice(),
+                config.config.ftd_inline_css.as_slice(),
                 html_ui.css.as_str(),
             )
             .as_str(),
@@ -750,12 +754,12 @@ pub fn replace_markers_2023(
     font_style: &str,
     default_css: &str,
     base_url: &str,
-    config: &mut fastn_core::Config,
+    config: &mut fastn_core::RequestConfig,
 ) -> String {
     ftd::html::utils::trim_all_lines(
         s.replace(
             "__fastn_package__",
-            get_fastn_package_data(&config.package).as_str(),
+            get_fastn_package_data(&config.config.package).as_str(),
         )
         .replace(
             "__js_script__",
@@ -768,9 +772,9 @@ pub fn replace_markers_2023(
         .replace(
             "__favicon_html_tag__",
             resolve_favicon(
-                config.root.as_str(),
-                config.package.name.as_str(),
-                &config.package.favicon,
+                config.config.root.as_str(),
+                config.config.package.name.as_str(),
+                &config.config.package.favicon,
             )
             .unwrap_or_default()
             .as_str(),
@@ -787,7 +791,7 @@ pub fn replace_markers_2023(
                 "#,
                 hashed_markdown_js(),
                 hashed_prism_js(),
-                hashed_default_ftd_js(config.package.name.as_str()),
+                hashed_default_ftd_js(config.config.package.name.as_str()),
                 hashed_prism_css(),
                 scripts,
             )
@@ -796,8 +800,8 @@ pub fn replace_markers_2023(
         .replace(
             "__extra_js__",
             get_extra_js(
-                config.ftd_external_js.as_slice(),
-                config.ftd_inline_js.as_slice(),
+                config.config.ftd_external_js.as_slice(),
+                config.config.ftd_inline_js.as_slice(),
                 "",
                 "",
             )
diff --git a/fastn/src/main.rs b/fastn/src/main.rs
index b20708a5ea..98932529cc 100644
--- a/fastn/src/main.rs
+++ b/fastn/src/main.rs
@@ -173,7 +173,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
             .add_inline_css(inline_css);
 
         return fastn_core::build(
-            &mut config,
+            &config,
             build.value_of_("file"), // TODO: handle more than one files
             build.value_of_("base").unwrap_or("/"),
             build.get_flag("ignore-failed"),

From f29103844bb73f4e6abf9b5891e67ad48d5ae460 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Tue, 31 Oct 2023 21:26:37 +0530
Subject: [PATCH 07/32] 4 errors

---
 fastn-core/src/apis/cache.rs                  |  5 ++---
 fastn-core/src/apis/clone.rs                  |  4 ++--
 fastn-core/src/apis/cr.rs                     |  4 ++--
 fastn-core/src/apis/edit.rs                   |  6 +++---
 fastn-core/src/apis/edit_source.rs            |  2 +-
 fastn-core/src/apis/sync.rs                   |  4 ++--
 fastn-core/src/apis/sync2.rs                  |  4 ++--
 fastn-core/src/apis/view_source.rs            |  7 ++++---
 fastn-core/src/commands/build.rs              | 13 ++++++------
 fastn-core/src/commands/serve.rs              | 21 ++++++++++---------
 fastn-core/src/doc.rs                         |  2 +-
 fastn-core/src/library/document.rs            |  2 +-
 fastn-core/src/library/fastn_dot_ftd.rs       | 10 ++++-----
 fastn-core/src/library/mod.rs                 | 12 +++++------
 fastn-core/src/library2022/mod.rs             |  6 +++---
 .../src/library2022/processor/document.rs     | 10 ++++-----
 .../src/library2022/processor/fetch_file.rs   |  2 +-
 fastn-core/src/library2022/processor/http.rs  |  2 +-
 fastn-core/src/library2022/processor/query.rs |  2 +-
 .../src/library2022/processor/sitemap.rs      |  6 +++---
 .../src/library2022/processor/sqlite.rs       |  4 ++--
 .../src/library2022/processor/user_group.rs   |  6 +++---
 fastn-core/src/library2022/utils.rs           |  2 +-
 fastn-core/src/package/app.rs                 |  5 ++++-
 fastn-core/src/package/package_doc.rs         |  8 +++----
 fastn-core/src/package/user_group.rs          | 20 ++++++++++--------
 26 files changed, 88 insertions(+), 81 deletions(-)

diff --git a/fastn-core/src/apis/cache.rs b/fastn-core/src/apis/cache.rs
index d957bcbb9a..53a9e6c07c 100644
--- a/fastn-core/src/apis/cache.rs
+++ b/fastn-core/src/apis/cache.rs
@@ -63,11 +63,10 @@ pub async fn clear(req: &fastn_core::http::Request) -> fastn_core::http::Respons
 
 pub async fn clear_(
     query: &QueryParams,
-    req: &fastn_core::http::Request,
+    _req: &fastn_core::http::Request,
 ) -> fastn_core::Result<()> {
     let config =
-        fastn_core::time("Config::read()")
-            .it(fastn_core::Config::read(None, false, Some(req)).await?);
+        fastn_core::time("Config::read()").it(fastn_core::Config::read(None, false).await?);
     if config.package.download_base_url.is_none() {
         return Err(fastn_core::Error::APIResponseError(
             "cannot remove anything, package does not have `download_base_url`".to_string(),
diff --git a/fastn-core/src/apis/clone.rs b/fastn-core/src/apis/clone.rs
index 007acfa9ac..103ccba1ce 100644
--- a/fastn-core/src/apis/clone.rs
+++ b/fastn-core/src/apis/clone.rs
@@ -15,10 +15,10 @@ pub async fn clone(
     }
 }
 
-async fn clone_worker(req: fastn_core::http::Request) -> fastn_core::Result<CloneResponse> {
+async fn clone_worker(_req: fastn_core::http::Request) -> fastn_core::Result<CloneResponse> {
     use itertools::Itertools;
 
-    let config = fastn_core::Config::read(None, false, Some(&req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
     let all_files = config
         .get_all_file_path(&config.package, Default::default())?
         .into_iter()
diff --git a/fastn-core/src/apis/cr.rs b/fastn-core/src/apis/cr.rs
index 7240d18b3f..a147926d70 100644
--- a/fastn-core/src/apis/cr.rs
+++ b/fastn-core/src/apis/cr.rs
@@ -21,10 +21,10 @@ pub async fn create_cr(
 }
 
 async fn create_cr_worker(
-    req: &fastn_core::http::Request,
+    _req: &fastn_core::http::Request,
     cr_request: CreateCRRequest,
 ) -> fastn_core::Result<usize> {
-    let config = fastn_core::Config::read(None, false, Some(req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
     let cr_number = config.extract_cr_number().await?;
     let default_title = format!("CR#{cr_number}");
     let cr_meta = fastn_core::cr::CRMeta {
diff --git a/fastn-core/src/apis/edit.rs b/fastn-core/src/apis/edit.rs
index ba5811eb9d..dd4857377a 100644
--- a/fastn-core/src/apis/edit.rs
+++ b/fastn-core/src/apis/edit.rs
@@ -28,7 +28,7 @@ pub async fn edit(
     req: &fastn_core::http::Request,
     req_data: EditRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let mut config = match fastn_core::Config::read(None, false).await {
+    let config = match fastn_core::Config::read(None, false).await {
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
@@ -199,10 +199,10 @@ pub struct RevertRequest {
 }
 
 pub async fn revert(
-    req: &fastn_core::http::Request,
+    _req: &fastn_core::http::Request,
     rev: RevertRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = match fastn_core::Config::read(None, false, Some(req)).await {
+    let config = match fastn_core::Config::read(None, false).await {
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
diff --git a/fastn-core/src/apis/edit_source.rs b/fastn-core/src/apis/edit_source.rs
index e706ce402c..269e9c16e0 100644
--- a/fastn-core/src/apis/edit_source.rs
+++ b/fastn-core/src/apis/edit_source.rs
@@ -25,7 +25,7 @@ async fn handle_view_source(
     let mut req_config = fastn_core::RequestConfig::new(&config, &req);
 
     let file_name = config.get_file_path_and_resolve(path).await?;
-    let file = config.get_file_and_package_by_id(path).await?;
+    let file = req_config.get_file_and_package_by_id(path).await?;
 
     match file {
         fastn_core::File::Ftd(_) | fastn_core::File::Markdown(_) | fastn_core::File::Code(_) => {
diff --git a/fastn-core/src/apis/sync.rs b/fastn-core/src/apis/sync.rs
index e7e57ba45f..f8475a79be 100644
--- a/fastn-core/src/apis/sync.rs
+++ b/fastn-core/src/apis/sync.rs
@@ -75,13 +75,13 @@ pub async fn sync(
 }
 
 pub(crate) async fn sync_worker(
-    req: &fastn_core::http::Request,
+    _req: &fastn_core::http::Request,
     request: SyncRequest,
 ) -> fastn_core::Result<SyncResponse> {
     use itertools::Itertools;
 
     // TODO: Need to call at once only
-    let config = fastn_core::Config::read(None, false, Some(req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
     let mut snapshots = fastn_core::snapshot::get_latest_snapshots(&config.root).await?;
     let client_snapshots = fastn_core::snapshot::resolve_snapshots(&request.latest_ftd).await?;
     // let latest_ftd = tokio::fs::read_to_string(config.history_dir().join(".latest.ftd")).await?;
diff --git a/fastn-core/src/apis/sync2.rs b/fastn-core/src/apis/sync2.rs
index debff5668b..f21ace4003 100644
--- a/fastn-core/src/apis/sync2.rs
+++ b/fastn-core/src/apis/sync2.rs
@@ -308,13 +308,13 @@ pub(crate) async fn do_sync(
 }
 
 pub(crate) async fn sync_worker(
-    req: &fastn_core::http::Request,
+    _req: &fastn_core::http::Request,
     request: SyncRequest,
 ) -> fastn_core::Result<SyncResponse> {
     use itertools::Itertools;
 
     // TODO: Need to call at once only
-    let config = fastn_core::Config::read(None, false, Some(req)).await?;
+    let config = fastn_core::Config::read(None, false).await?;
     let mut synced_files = do_sync(&config, request.files.as_slice()).await?;
     let remote_history = config.get_history().await?;
     let remote_manifest =
diff --git a/fastn-core/src/apis/view_source.rs b/fastn-core/src/apis/view_source.rs
index 306616c04f..5997e9ad7b 100644
--- a/fastn-core/src/apis/view_source.rs
+++ b/fastn-core/src/apis/view_source.rs
@@ -21,9 +21,10 @@ async fn handle_view_source(
     req: &fastn_core::http::Request,
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
-    let mut config = fastn_core::Config::read(None, false, Some(req)).await?;
+    let mut config = fastn_core::Config::read(None, false).await?;
+    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     let file_name = config.get_file_path_and_resolve(path).await?;
-    let file = config.get_file_and_package_by_id(path).await?;
+    let file = req_config.get_file_and_package_by_id(path).await?;
 
     match file {
         fastn_core::File::Ftd(_) | fastn_core::File::Markdown(_) | fastn_core::File::Code(_) => {
@@ -37,7 +38,7 @@ async fn handle_view_source(
                 package_name: config.package.name.clone(),
             };
             fastn_core::package::package_doc::read_ftd(
-                &mut config,
+                &mut req_config,
                 &main_document,
                 "/",
                 false,
diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 3ff954ef08..b18a861f81 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -663,7 +663,7 @@ async fn handle_file_(
             return Ok(());
         }
         fastn_core::File::Image(main_doc) => {
-            process_static(main_doc, &config.config.root, &config.package).await?;
+            process_static(main_doc, &config.config.root, &config.config.package).await?;
         }
         fastn_core::File::Code(doc) => {
             process_static(
@@ -753,7 +753,7 @@ async fn get_documents_for_current_package(
     let mut documents = std::collections::BTreeMap::from_iter(
         config
             .config
-            .get_files(&config.package)
+            .get_files(&config.config.package)
             .await?
             .into_iter()
             .map(|v| (v.get_id().to_string(), v)),
@@ -766,12 +766,13 @@ async fn get_documents_for_current_package(
         for (doc_path, _, url) in get_all_locations {
             let file = {
                 let package_name = if let Some(ref url) = url {
-                    new_config.find_package_by_id(url).await?.1.name
+                    new_config.config.find_package_by_id(url).await?.1.name
                 } else {
-                    config.package.name.to_string()
+                    config.config.package.name.to_string()
                 };
                 let mut file =
-                    fastn_core::get_file(package_name, doc_path, config.root.as_path()).await?;
+                    fastn_core::get_file(package_name, doc_path, config.config.root.as_path())
+                        .await?;
                 if let Some(ref url) = url {
                     let url = url.replace("/index.html", "");
                     let extension = if matches!(file, fastn_core::File::Markdown(_)) {
@@ -791,7 +792,7 @@ async fn get_documents_for_current_package(
             .config
             .all_packages
             .borrow_mut()
-            .extend(new_config.all_packages.into_inner());
+            .extend(new_config.config.all_packages.into_inner());
         documents.extend(files);
     }
 
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index b038b3ff47..104adeef9f 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -129,7 +129,8 @@ async fn serve_cr_file(
     cr_number: usize,
 ) -> fastn_core::http::Response {
     let _lock = LOCK.read().await;
-    let f = match config
+    let f = match req_config
+        .config
         .get_file_and_package_by_cr_id(path.as_str(), cr_number)
         .await
     {
@@ -153,11 +154,11 @@ async fn serve_cr_file(
         }
     }
 
-    config.current_document = Some(f.get_id().to_string());
+    req_config.current_document = Some(f.get_id().to_string());
     match f {
         fastn_core::File::Ftd(main_document) => {
             match fastn_core::package::package_doc::read_ftd(
-                config,
+                req_config,
                 &main_document,
                 "/",
                 false,
@@ -482,10 +483,10 @@ pub async fn revert(
 }
 
 pub async fn editor_sync(
-    req: fastn_core::http::Request,
+    _req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::edit::sync(req).await
+    fastn_core::apis::edit::sync().await
 }
 
 pub async fn create_cr(
@@ -650,11 +651,11 @@ async fn route(
     let config = fastn_core::Config::read(None, false)
         .await
         .unwrap()
-        .add_edition(edition)?
-        .add_external_js(external_js)
-        .add_inline_js(inline_js)
-        .add_external_css(external_css)
-        .add_inline_css(inline_css);
+        .add_edition(app_data.edition.clone())?
+        .add_external_js(app_data.external_js.clone())
+        .add_inline_js(app_data.inline_js.clone())
+        .add_external_css(app_data.external_css.clone())
+        .add_inline_css(app_data.inline_css.clone());
 
     actual_route(&config, req, body, app_data).await
 }
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index 3c8acac312..381c87465c 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -635,7 +635,7 @@ pub async fn resolve_foreign_variable2(
     async fn get_assets_value(
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2,
+        lib: &mut fastn_core::Library2<'_>,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
diff --git a/fastn-core/src/library/document.rs b/fastn-core/src/library/document.rs
index 9b11b80958..a74c07dbbc 100644
--- a/fastn-core/src/library/document.rs
+++ b/fastn-core/src/library/document.rs
@@ -50,7 +50,7 @@ pub fn document_full_id(
     let full_document_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
-            .replace(config.package.name.as_str(), "")
+            .replace(req_config.config.package.name.as_str(), "")
     });
 
     if full_document_id.trim_matches('/').is_empty() {
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index f34e9b8b30..adf7e018dd 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -1,6 +1,6 @@
 use crate::utils::HasElements;
 
-async fn i18n_data(lib: &fastn_core::Library) -> String {
+async fn i18n_data(lib: &fastn_core::Library<'_>) -> String {
     let lang = match lib.config.config.package.language {
         Some(ref lang) => {
             realm_lang::Language::from_2_letter_code(lang).unwrap_or(realm_lang::Language::English)
@@ -243,7 +243,7 @@ fn construct_fastn_cli_variables(_lib: &fastn_core::Library) -> String {
     )
 }
 
-pub(crate) async fn get2022_(lib: &fastn_core::Library) -> String {
+pub(crate) async fn get2022_(lib: &fastn_core::Library<'_>) -> String {
     #[allow(clippy::format_in_format_args)]
     let mut fastn_base = format!(
         indoc::indoc! {"
@@ -299,7 +299,7 @@ pub(crate) async fn get2022_(lib: &fastn_core::Library) -> String {
     fastn_base
 }
 
-pub(crate) async fn get(lib: &fastn_core::Library) -> String {
+pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
     #[allow(clippy::format_in_format_args)]
     let mut fastn_base = format!(
         indoc::indoc! {"
@@ -812,7 +812,7 @@ pub(crate) async fn get(lib: &fastn_core::Library) -> String {
     fastn_base
 }
 
-pub(crate) async fn get2(lib: &fastn_core::Library2) -> String {
+pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
     let lib = fastn_core::Library {
         config: lib.config.clone(),
         markdown: lib.markdown.clone(),
@@ -824,7 +824,7 @@ pub(crate) async fn get2(lib: &fastn_core::Library2) -> String {
     get(&lib).await
 }
 
-pub(crate) async fn get2022(lib: &fastn_core::Library2022) -> String {
+pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_>) -> String {
     let lib = fastn_core::Library {
         config: lib.config.clone(),
         markdown: lib.markdown.clone(),
diff --git a/fastn-core/src/library/mod.rs b/fastn-core/src/library/mod.rs
index ffa1f707c6..1a997fb24d 100644
--- a/fastn-core/src/library/mod.rs
+++ b/fastn-core/src/library/mod.rs
@@ -19,7 +19,7 @@ pub struct Library<'a> {
     pub base_url: String,
 }
 
-impl Library {
+impl Library<'_> {
     pub async fn get_with_result(
         &self,
         name: &str,
@@ -46,7 +46,7 @@ impl Library {
         async fn get_for_package(
             name: &str,
             packages: &mut Vec<fastn_core::Package>,
-            lib: &fastn_core::Library,
+            lib: &fastn_core::Library<'_>,
         ) -> Option<String> {
             let package = packages.last()?;
             if name.starts_with(package.name.as_str()) {
@@ -120,7 +120,7 @@ impl Library {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &Library,
+            lib: &Library<'_>,
         ) -> Option<String> {
             let path = lib.config.config.get_root_for_package(package);
             fastn_core::Config::download_required_file(&lib.config.config.root, name, package)
@@ -158,7 +158,7 @@ pub struct Library2<'a> {
     pub packages_under_process: Vec<String>,
 }
 
-impl Library2 {
+impl Library2<'_> {
     pub(crate) async fn push_package_under_process(
         &mut self,
         package: &fastn_core::Package,
@@ -236,7 +236,7 @@ impl Library2 {
 
         return get_for_package(format!("{}/", name.trim_end_matches('/')).as_str(), self).await;
 
-        async fn get_for_package(name: &str, lib: &mut fastn_core::Library2) -> Option<String> {
+        async fn get_for_package(name: &str, lib: &mut fastn_core::Library2<'_>) -> Option<String> {
             let package = lib.get_current_package().ok()?;
             if name.starts_with(package.name.as_str()) {
                 if let Some(r) = get_data_from_package(name, &package, lib).await {
@@ -291,7 +291,7 @@ impl Library2 {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut Library2,
+            lib: &mut Library2<'_>,
         ) -> Option<String> {
             lib.push_package_under_process(package).await.ok()?;
             let packages = lib.config.config.all_packages.borrow();
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 5a6eeae962..34e78d29fb 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -25,7 +25,7 @@ pub struct Library2022<'a> {
     pub module_package_map: std::collections::BTreeMap<String, String>,
 }
 
-impl Library2022 {
+impl Library2022<'_> {
     pub async fn get_with_result(
         &mut self,
         name: &str,
@@ -86,7 +86,7 @@ impl Library2022 {
 
         async fn get_for_package(
             name: &str,
-            lib: &mut fastn_core::Library2022,
+            lib: &mut fastn_core::Library2022<'_>,
             current_processing_module: &str,
         ) -> Option<(String, String, usize)> {
             let package = lib.get_current_package(current_processing_module).ok()?;
@@ -150,7 +150,7 @@ impl Library2022 {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut fastn_core::Library2022,
+            lib: &mut fastn_core::Library2022<'_>,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
             let packages = lib.config.config.all_packages.borrow();
diff --git a/fastn-core/src/library2022/processor/document.rs b/fastn-core/src/library2022/processor/document.rs
index 3fe69ba3ed..eb59b8d692 100644
--- a/fastn-core/src/library2022/processor/document.rs
+++ b/fastn-core/src/library2022/processor/document.rs
@@ -21,7 +21,7 @@ pub fn process_readers(
 
     let readers = match req_config.config.package.sitemap.as_ref() {
         Some(s) => s
-            .readers(document_name.as_str(), &config.package.groups)
+            .readers(document_name.as_str(), &req_config.config.package.groups)
             .0
             .into_iter()
             .map(|g| g.to_group_compat())
@@ -55,7 +55,7 @@ pub fn process_writers(
     let document_name = req_config.document_name_with_default(document.as_str());
     let writers = match req_config.config.package.sitemap.as_ref() {
         Some(s) => s
-            .writers(document_name.as_str(), &config.package.groups)
+            .writers(document_name.as_str(), &req_config.config.package.groups)
             .into_iter()
             .map(|g| g.to_group_compat())
             .collect_vec(),
@@ -114,7 +114,7 @@ pub fn document_suffix(
     let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
-            .replace(config.package.name.as_str(), "")
+            .replace(req_config.config.package.name.as_str(), "")
     });
 
     let value = doc_id
@@ -136,12 +136,12 @@ pub async fn document_name<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    req_config: &fastn_core::RequestConfig,
+    req_config: &fastn_core::RequestConfig<'_>,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
-            .replace(config.package.name.as_str(), "")
+            .replace(req_config.config.package.name.as_str(), "")
     });
 
     let file_path = req_config
diff --git a/fastn-core/src/library2022/processor/fetch_file.rs b/fastn-core/src/library2022/processor/fetch_file.rs
index 74d8251104..36075b3840 100644
--- a/fastn-core/src/library2022/processor/fetch_file.rs
+++ b/fastn-core/src/library2022/processor/fetch_file.rs
@@ -2,7 +2,7 @@ pub async fn fetch_files(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &fastn_core::RequestConfig,
+    req_config: &fastn_core::RequestConfig<'_>,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     if !kind.is_string() {
         return ftd::interpreter::utils::e2(
diff --git a/fastn-core/src/library2022/processor/http.rs b/fastn-core/src/library2022/processor/http.rs
index 1a8d4ac760..2acf5c8d8f 100644
--- a/fastn-core/src/library2022/processor/http.rs
+++ b/fastn-core/src/library2022/processor/http.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &fastn_core::RequestConfig,
+    req_config: &fastn_core::RequestConfig<'_>,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, line_number) = if let Ok(val) = value.get_record(doc.name) {
         (val.2.to_owned(), val.5.to_owned())
diff --git a/fastn-core/src/library2022/processor/query.rs b/fastn-core/src/library2022/processor/query.rs
index 8772013360..a1589a5b6f 100644
--- a/fastn-core/src/library2022/processor/query.rs
+++ b/fastn-core/src/library2022/processor/query.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &mut fastn_core::RequestConfig,
+    req_config: &mut fastn_core::RequestConfig<'_>,
     document_id: &str,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     // TODO: document key should be optional
diff --git a/fastn-core/src/library2022/processor/sitemap.rs b/fastn-core/src/library2022/processor/sitemap.rs
index b441563cce..60dc09bd6e 100644
--- a/fastn-core/src/library2022/processor/sitemap.rs
+++ b/fastn-core/src/library2022/processor/sitemap.rs
@@ -12,7 +12,7 @@ pub fn process(
             .unwrap_or_else(|| {
                 doc.name
                     .to_string()
-                    .replace(config.package.name.as_str(), "")
+                    .replace(req_config.config.package.name.as_str(), "")
             })
             .trim()
             .replace(std::path::MAIN_SEPARATOR, "/");
@@ -34,7 +34,7 @@ pub fn full_sitemap_process(
     doc: &ftd::interpreter::TDoc,
     req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    if let Some(ref sitemap) = config.package.sitemap {
+    if let Some(ref sitemap) = req_config.config.package.sitemap {
         let doc_id = req_config
             .current_document
             .clone()
@@ -42,7 +42,7 @@ pub fn full_sitemap_process(
             .unwrap_or_else(|| {
                 doc.name
                     .to_string()
-                    .replace(config.package.name.as_str(), "")
+                    .replace(req_config.config.package.name.as_str(), "")
             })
             .trim()
             .replace(std::path::MAIN_SEPARATOR, "/");
diff --git a/fastn-core/src/library2022/processor/sqlite.rs b/fastn-core/src/library2022/processor/sqlite.rs
index 5b5af34e58..1587f5b44e 100644
--- a/fastn-core/src/library2022/processor/sqlite.rs
+++ b/fastn-core/src/library2022/processor/sqlite.rs
@@ -28,7 +28,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &fastn_core::RequestConfig,
+    req_config: &fastn_core::RequestConfig<'_>,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, query) = get_p1_data("package-data", &value, doc.name)?;
 
@@ -57,7 +57,7 @@ pub async fn process(
                 value.line_number(),
             );
         }
-        sqlite_database_path = config.root.join(sqlite_database_path.as_path());
+        sqlite_database_path = req_config.config.root.join(sqlite_database_path.as_path());
     }
 
     // need the query params
diff --git a/fastn-core/src/library2022/processor/user_group.rs b/fastn-core/src/library2022/processor/user_group.rs
index 17e13a1e2c..bafeea8472 100644
--- a/fastn-core/src/library2022/processor/user_group.rs
+++ b/fastn-core/src/library2022/processor/user_group.rs
@@ -62,7 +62,7 @@ pub fn get_identities(
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     use itertools::Itertools;
 
-    let doc_id = fastn_core::library2022::utils::document_full_id(config, doc)?;
+    let doc_id = fastn_core::library2022::utils::document_full_id(req_config, doc)?;
 
     let identities =
         fastn_core::user_group::get_identities(req_config.config, doc_id.as_str(), true).map_err(
@@ -97,9 +97,9 @@ pub async fn is_reader<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    req_config: &fastn_core::RequestConfig,
+    req_config: &fastn_core::RequestConfig<'_>,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-    let doc_id = fastn_core::library2022::utils::document_full_id(config, doc)?;
+    let doc_id = fastn_core::library2022::utils::document_full_id(req_config, doc)?;
     let is_reader = req_config.can_read(&doc_id, false).await.map_err(|e| {
         ftd::ftd2021::p1::Error::ParseError {
             message: e.to_string(),
diff --git a/fastn-core/src/library2022/utils.rs b/fastn-core/src/library2022/utils.rs
index 6b965ca3eb..d91b49e0fe 100644
--- a/fastn-core/src/library2022/utils.rs
+++ b/fastn-core/src/library2022/utils.rs
@@ -5,7 +5,7 @@ pub fn document_full_id(
     let full_document_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
             .to_string()
-            .replace(config.package.name.as_str(), "")
+            .replace(req_config.config.package.name.as_str(), "")
     });
 
     if full_document_id.trim_matches('/').is_empty() {
diff --git a/fastn-core/src/package/app.rs b/fastn-core/src/package/app.rs
index 31139ce820..b0be2cf914 100644
--- a/fastn-core/src/package/app.rs
+++ b/fastn-core/src/package/app.rs
@@ -94,7 +94,10 @@ impl AppTemp {
 }
 
 // Takes the path /-/<package-name>/<remaining>/ or /mount-point/<remaining>/
-pub async fn can_read(config: &fastn_core::RequestConfig, path: &str) -> fastn_core::Result<bool> {
+pub async fn can_read(
+    config: &fastn_core::RequestConfig<'_>,
+    path: &str,
+) -> fastn_core::Result<bool> {
     use itertools::Itertools;
     // first get the app
     let readers_groups = if let Some((_, _, _, Some(app))) = config
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index dc4ef6f3a1..aa70df86cd 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -364,7 +364,7 @@ impl From<FTDResult> for fastn_core::http::Response {
 
 #[tracing::instrument(skip_all)]
 pub(crate) async fn read_ftd(
-    config: &mut fastn_core::RequestConfig,
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -386,7 +386,7 @@ pub(crate) async fn read_ftd(
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
 pub(crate) async fn read_ftd_2022(
-    config: &mut fastn_core::RequestConfig,
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -463,7 +463,7 @@ pub(crate) async fn read_ftd_2022(
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
 pub(crate) async fn read_ftd_2023(
-    config: &mut fastn_core::RequestConfig,
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -550,7 +550,7 @@ pub(crate) async fn read_ftd_2023(
 }
 
 pub(crate) async fn process_ftd(
-    config: &mut fastn_core::RequestConfig,
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
diff --git a/fastn-core/src/package/user_group.rs b/fastn-core/src/package/user_group.rs
index 3e984c3054..087938d9a7 100644
--- a/fastn-core/src/package/user_group.rs
+++ b/fastn-core/src/package/user_group.rs
@@ -606,13 +606,14 @@ pub mod processor {
         req_config: &fastn_core::RequestConfig,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
         let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
-        let identities = super::get_identities(config, doc_id.as_str(), true).map_err(|e| {
-            ftd::ftd2021::p1::Error::ParseError {
-                message: e.to_string(),
-                doc_id,
-                line_number: section.line_number,
-            }
-        })?;
+        let identities =
+            super::get_identities(req_config.config, doc_id.as_str(), true).map_err(|e| {
+                ftd::ftd2021::p1::Error::ParseError {
+                    message: e.to_string(),
+                    doc_id,
+                    line_number: section.line_number,
+                }
+            })?;
 
         Ok(ftd::Value::List {
             data: identities
@@ -641,10 +642,11 @@ pub mod processor {
     pub async fn is_reader<'a>(
         section: &ftd::ftd2021::p1::Section,
         doc: &'a ftd::ftd2021::p2::TDoc<'_>,
-        req_config: &fastn_core::RequestConfig,
+        req_config: &fastn_core::RequestConfig<'_>,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
         let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
-        let is_reader = config
+        let is_reader = req_config
+            .config
             .can_read(req_config.request, &doc_id, false)
             .await
             .map_err(|e| ftd::ftd2021::p1::Error::ParseError {

From 5988428c2205df38c05c32715960e7fe63c05b43 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Tue, 31 Oct 2023 21:27:59 +0530
Subject: [PATCH 08/32] 3 errors

---
 fastn-core/src/apis/view_source.rs   |  2 +-
 fastn-core/src/package/user_group.rs | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fastn-core/src/apis/view_source.rs b/fastn-core/src/apis/view_source.rs
index 5997e9ad7b..e86ede1338 100644
--- a/fastn-core/src/apis/view_source.rs
+++ b/fastn-core/src/apis/view_source.rs
@@ -21,7 +21,7 @@ async fn handle_view_source(
     req: &fastn_core::http::Request,
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
-    let mut config = fastn_core::Config::read(None, false).await?;
+    let config = fastn_core::Config::read(None, false).await?;
     let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
diff --git a/fastn-core/src/package/user_group.rs b/fastn-core/src/package/user_group.rs
index 087938d9a7..8de4829a67 100644
--- a/fastn-core/src/package/user_group.rs
+++ b/fastn-core/src/package/user_group.rs
@@ -645,15 +645,13 @@ pub mod processor {
         req_config: &fastn_core::RequestConfig<'_>,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
         let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
-        let is_reader = req_config
-            .config
-            .can_read(req_config.request, &doc_id, false)
-            .await
-            .map_err(|e| ftd::ftd2021::p1::Error::ParseError {
+        let is_reader = req_config.can_read(&doc_id, false).await.map_err(|e| {
+            ftd::ftd2021::p1::Error::ParseError {
                 message: e.to_string(),
                 doc_id,
                 line_number: section.line_number,
-            })?;
+            }
+        })?;
 
         Ok(ftd::Value::Boolean { value: is_reader })
     }

From c690a0cfe2b2ee06fea450496a6749a082c96f50 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Tue, 31 Oct 2023 22:30:26 +0530
Subject: [PATCH 09/32] looks like we are making progress

---
 fastn-core/src/commands/serve.rs      | 12 ++--
 fastn-core/src/library2022/mod.rs     |  2 +-
 fastn-core/src/package/package_doc.rs | 83 ++++++++++++---------------
 fastn-core/src/utils.rs               | 38 ++++++------
 4 files changed, 63 insertions(+), 72 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 104adeef9f..e6cb756de0 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,8 +18,8 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file(
-    config: &mut fastn_core::RequestConfig<'_>,
+async fn serve_file<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
     if let Some(r) = handle_redirect(config.config, path) {
@@ -123,8 +123,8 @@ async fn serve_file(
     }
 }
 
-async fn serve_cr_file(
-    req_config: &mut fastn_core::RequestConfig<'_>,
+async fn serve_cr_file<'a>(
+    req_config: &'a mut fastn_core::RequestConfig<'a>,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
@@ -303,6 +303,8 @@ pub async fn serve(
 
         // if request goes with mount-point /todos/api/add-todo/
         // so it should say not found and pass it to proxy
+        let cookies = req_config.request.cookies();
+
         let file_response = serve_file(&mut req_config, path.as_path()).await;
         // If path is not present in sitemap then pass it to proxy
         // TODO: Need to handle other package URL as well, and that will start from `-`
@@ -338,7 +340,7 @@ pub async fn serve(
                         if let Some(user_data) = fastn_core::auth::get_user_data_from_cookies(
                             platform,
                             requested_field,
-                            req_config.request.cookies(),
+                            cookies,
                         )
                         .await?
                         {
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 34e78d29fb..20e5ef142e 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -15,7 +15,7 @@ impl KeyValueData {
 
 #[derive(Debug)]
 pub struct Library2022<'a> {
-    pub config: fastn_core::RequestConfig<'a>,
+    pub config: &'a mut fastn_core::RequestConfig<'a>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index aa70df86cd..a98862455b 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,21 +385,26 @@ pub(crate) async fn read_ftd(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd_2022<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
     test: bool,
 ) -> fastn_core::Result<FTDResult> {
-    let lib_config = config.clone();
-    let mut all_packages = config.config.all_packages.borrow_mut();
-    let current_package = all_packages
+    let font_style = config.config.get_font_style();
+    let c = config.config;
+
+    let current_package = config
+        .config
+        .all_packages
+        .borrow()
         .get(main.package_name.as_str())
-        .unwrap_or(&config.config.package);
+        .unwrap_or(&config.config.package)
+        .to_owned();
 
     let mut lib = fastn_core::Library2022 {
-        config: lib_config,
+        config,
         markdown: None,
         document_id: main.id.clone(),
         translated_data: Default::default(),
@@ -432,26 +437,19 @@ pub(crate) async fn read_ftd_2022(
             });
         }
     };
-    config.dependencies_during_render = lib.config.dependencies_during_render;
+
     if let Some((url, code)) = main_ftd_doc.get_redirect()? {
         return Ok(FTDResult::Redirect { url, code });
     }
+
     let executor = ftd::executor::ExecuteDoc::from_interpreter(main_ftd_doc)?;
     let node = ftd::node::NodeData::from_rt(executor);
     let html_ui = ftd::html::HtmlUI::from_node_data(node, "main", test)?;
 
-    config
-        .downloaded_assets
-        .extend(lib.config.downloaded_assets);
-
-    all_packages.extend(lib.config.config.all_packages.into_inner());
-    drop(all_packages);
-
-    let font_style = config.config.get_font_style();
     let file_content = fastn_core::utils::replace_markers_2022(
         fastn_core::ftd_html(),
         html_ui,
-        config,
+        c,
         main.id_to_path().as_str(),
         font_style.as_str(),
         base_url,
@@ -462,20 +460,26 @@ pub(crate) async fn read_ftd_2022(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd_2023<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
 ) -> fastn_core::Result<FTDResult> {
-    let lib_config = config.clone();
-    let mut all_packages = config.config.all_packages.borrow_mut();
-    let current_package = all_packages
+    let package_name = config.config.package.name.to_string();
+    let font_style = config.config.get_font_style();
+    let c = config.config;
+
+    let current_package = config
+        .config
+        .all_packages
+        .borrow()
         .get(main.package_name.as_str())
-        .unwrap_or(&config.config.package);
+        .unwrap_or(&config.config.package)
+        .to_owned();
 
     let mut lib = fastn_core::Library2022 {
-        config: lib_config,
+        config,
         markdown: None,
         document_id: main.id.clone(),
         translated_data: Default::default(),
@@ -508,33 +512,21 @@ pub(crate) async fn read_ftd_2023(
             });
         }
     };
-    config.dependencies_during_render = lib.config.dependencies_during_render;
     if let Some((url, code)) = main_ftd_doc.get_redirect()? {
         return Ok(FTDResult::Redirect { url, code });
     }
 
     let js_ast_data = ftd::js::document_into_js_ast(main_ftd_doc);
-    let js_document_script = fastn_js::to_js(
-        js_ast_data.asts.as_slice(),
-        config.config.package.name.as_str(),
-    );
+    let js_document_script = fastn_js::to_js(js_ast_data.asts.as_slice(), package_name.as_str());
     let js_ftd_script = fastn_js::to_js(
         ftd::js::default_bag_into_js_ast().as_slice(),
-        config.config.package.name.as_str(),
+        package_name.as_str(),
     );
     let ssr_body = fastn_js::ssr_with_js_string(
-        &config.config.package.name,
+        &package_name,
         format!("{js_ftd_script}\n{js_document_script}").as_str(),
     );
 
-    all_packages.extend(lib.config.config.all_packages.into_inner());
-    drop(all_packages);
-
-    config
-        .downloaded_assets
-        .extend(lib.config.downloaded_assets);
-
-    let font_style = config.config.get_font_style();
     let file_content = fastn_core::utils::replace_markers_2023(
         ftd::ftd_js_html(),
         js_document_script.as_str(),
@@ -543,22 +535,23 @@ pub(crate) async fn read_ftd_2023(
         font_style.as_str(),
         ftd::ftd_js_css(),
         base_url,
-        config,
+        c,
     );
 
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn process_ftd<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
     test: bool,
     file_path: &str,
 ) -> fastn_core::Result<FTDResult> {
+    let build_dir = config.config.build_dir();
     let response = read_ftd(config, main, base_url, build_static_files, test).await?;
-    fastn_core::utils::overwrite(&config.config.build_dir(), file_path, &response.html()).await?;
+    fastn_core::utils::overwrite(&build_dir, file_path, &response.html()).await?;
 
     Ok(response)
 }
diff --git a/fastn-core/src/utils.rs b/fastn-core/src/utils.rs
index ae66762d9c..95eedeaab7 100644
--- a/fastn-core/src/utils.rs
+++ b/fastn-core/src/utils.rs
@@ -656,7 +656,7 @@ fn get_extra_css(external_css: &[String], inline_css: &[String], css: &str) -> S
 pub fn replace_markers_2022(
     s: &str,
     html_ui: ftd::html::HtmlUI,
-    config: &mut fastn_core::RequestConfig,
+    config: &fastn_core::Config,
     main_id: &str,
     font_style: &str,
     base_url: &str,
@@ -673,18 +673,14 @@ pub fn replace_markers_2022(
         .replace("__ftd_data__", html_ui.variables.as_str())
         .replace(
             "__ftd_canonical_url__",
-            config
-                .config
-                .package
-                .generate_canonical_url(main_id)
-                .as_str(),
+            config.package.generate_canonical_url(main_id).as_str(),
         )
         .replace(
             "__favicon_html_tag__",
             resolve_favicon(
-                config.config.root.as_str(),
-                config.config.package.name.as_str(),
-                &config.config.package.favicon,
+                config.root.as_str(),
+                config.package.name.as_str(),
+                &config.package.favicon,
             )
             .unwrap_or_default()
             .as_str(),
@@ -699,8 +695,8 @@ pub fn replace_markers_2022(
         .replace(
             "__extra_js__",
             get_extra_js(
-                config.config.ftd_external_js.as_slice(),
-                config.config.ftd_inline_js.as_slice(),
+                config.ftd_external_js.as_slice(),
+                config.ftd_inline_js.as_slice(),
                 html_ui.js.as_str(),
                 html_ui.rive_data.as_str(),
             )
@@ -709,8 +705,8 @@ pub fn replace_markers_2022(
         .replace(
             "__extra_css__",
             get_extra_css(
-                config.config.ftd_external_css.as_slice(),
-                config.config.ftd_inline_css.as_slice(),
+                config.ftd_external_css.as_slice(),
+                config.ftd_inline_css.as_slice(),
                 html_ui.css.as_str(),
             )
             .as_str(),
@@ -754,12 +750,12 @@ pub fn replace_markers_2023(
     font_style: &str,
     default_css: &str,
     base_url: &str,
-    config: &mut fastn_core::RequestConfig,
+    config: &fastn_core::Config,
 ) -> String {
     ftd::html::utils::trim_all_lines(
         s.replace(
             "__fastn_package__",
-            get_fastn_package_data(&config.config.package).as_str(),
+            get_fastn_package_data(&config.package).as_str(),
         )
         .replace(
             "__js_script__",
@@ -772,9 +768,9 @@ pub fn replace_markers_2023(
         .replace(
             "__favicon_html_tag__",
             resolve_favicon(
-                config.config.root.as_str(),
-                config.config.package.name.as_str(),
-                &config.config.package.favicon,
+                config.root.as_str(),
+                config.package.name.as_str(),
+                &config.package.favicon,
             )
             .unwrap_or_default()
             .as_str(),
@@ -791,7 +787,7 @@ pub fn replace_markers_2023(
                 "#,
                 hashed_markdown_js(),
                 hashed_prism_js(),
-                hashed_default_ftd_js(config.config.package.name.as_str()),
+                hashed_default_ftd_js(config.package.name.as_str()),
                 hashed_prism_css(),
                 scripts,
             )
@@ -800,8 +796,8 @@ pub fn replace_markers_2023(
         .replace(
             "__extra_js__",
             get_extra_js(
-                config.config.ftd_external_js.as_slice(),
-                config.config.ftd_inline_js.as_slice(),
+                config.ftd_external_js.as_slice(),
+                config.ftd_inline_js.as_slice(),
                 "",
                 "",
             )

From 080eec445deacd45d8615d69577e158e2cfafcba Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Tue, 31 Oct 2023 22:47:24 +0530
Subject: [PATCH 10/32] some build progress

---
 fastn-core/src/commands/build.rs | 44 ++++++++++----------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index b18a861f81..6f5287aa63 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -208,8 +208,8 @@ fn is_virtual_dep(path: &str) -> bool {
         || path.ends_with("/-/assets.ftd")
 }
 
-async fn handle_dependency_file(
-    config: &mut fastn_core::RequestConfig<'_>,
+async fn handle_dependency_file<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     cache: &mut cache::Cache,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
@@ -289,8 +289,8 @@ fn remove_deleted_documents(
 }
 
 #[tracing::instrument(skip(config, documents))]
-async fn incremental_build(
-    config: &mut fastn_core::RequestConfig<'_>,
+async fn incremental_build<'a>(
+    config: &'a mut fastn_core::RequestConfig<'a>,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
     ignore_failed: bool,
@@ -423,9 +423,9 @@ async fn incremental_build(
 }
 
 #[tracing::instrument(skip(config, documents))]
-async fn handle_only_id(
+async fn handle_only_id<'a>(
     id: &str,
-    config: &mut fastn_core::RequestConfig<'_>,
+    config: &'a mut fastn_core::RequestConfig<'a>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -444,9 +444,9 @@ async fn handle_only_id(
     )))
 }
 
-async fn handle_file(
+async fn handle_file<'a>(
     document: &fastn_core::File,
-    config: &mut fastn_core::RequestConfig<'_>,
+    config: &'a mut fastn_core::RequestConfig<'a>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -455,7 +455,7 @@ async fn handle_file(
 ) -> fastn_core::Result<()> {
     let start = std::time::Instant::now();
     print!("Processing {} ... ", document.get_id_with_package());
-
+    let package_name = config.config.package.name.to_string();
     let process_status = handle_file_(
         document,
         config,
@@ -468,23 +468,13 @@ async fn handle_file(
     .await;
     if process_status.is_ok() {
         fastn_core::utils::print_end(
-            format!(
-                "Processed {}/{}",
-                config.config.package.name.as_str(),
-                document.get_id()
-            )
-            .as_str(),
+            format!("Processed {}/{}", package_name.as_str(), document.get_id()).as_str(),
             start,
         );
     }
     if process_status.is_err() {
         fastn_core::utils::print_error(
-            format!(
-                "Failed {}/{}",
-                config.config.package.name.as_str(),
-                document.get_id()
-            )
-            .as_str(),
+            format!("Failed {}/{}", package_name.as_str(), document.get_id()).as_str(),
             start,
         );
         return process_status;
@@ -582,9 +572,9 @@ fn remove_extension(id: &str) -> String {
 }
 
 #[tracing::instrument(skip(document, config, cache))]
-async fn handle_file_(
+async fn handle_file_<'a>(
     document: &fastn_core::File,
-    config: &mut fastn_core::RequestConfig<'_>,
+    config: &'a mut fastn_core::RequestConfig<'a>,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -760,13 +750,12 @@ async fn get_documents_for_current_package(
     );
 
     if let Some(ref sitemap) = config.config.package.sitemap {
-        let new_config = config.clone();
         let get_all_locations = sitemap.get_all_locations();
         let mut files: std::collections::HashMap<String, fastn_core::File> = Default::default();
         for (doc_path, _, url) in get_all_locations {
             let file = {
                 let package_name = if let Some(ref url) = url {
-                    new_config.config.find_package_by_id(url).await?.1.name
+                    config.config.find_package_by_id(url).await?.1.name
                 } else {
                     config.config.package.name.to_string()
                 };
@@ -788,11 +777,6 @@ async fn get_documents_for_current_package(
             files.insert(file.get_id().to_string(), file);
         }
 
-        config
-            .config
-            .all_packages
-            .borrow_mut()
-            .extend(new_config.config.all_packages.into_inner());
         documents.extend(files);
     }
 

From a360f75b87c8906c681b3272104e6032cb75e486 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Tue, 31 Oct 2023 23:14:59 +0530
Subject: [PATCH 11/32] what is this weird error

---
 Cargo.lock                       |  7 +++
 Cargo.toml                       |  1 +
 fastn-core/src/commands/build.rs | 88 ++++++++++++++------------------
 foo/Cargo.lock                   |  7 +++
 foo/Cargo.toml                   | 13 +++++
 foo/src/main.rs                  | 24 +++++++++
 6 files changed, 89 insertions(+), 51 deletions(-)
 create mode 100644 foo/Cargo.lock
 create mode 100644 foo/Cargo.toml
 create mode 100644 foo/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 00eaad5bf3..927c803750 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1875,6 +1875,13 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foo"
+version = "0.1.0"
+dependencies = [
+ "tokio",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
diff --git a/Cargo.toml b/Cargo.toml
index 56b7b4f9ff..ff2b38b589 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "fastn-issues",
     "fastn-js",
     "fastn-grammar",
+    "foo",
     # "fastn-wasm",
     # "fastn-runtime",
 ]
diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 6f5287aa63..b6a0748aac 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -9,9 +9,6 @@ pub async fn build(
 ) -> fastn_core::Result<()> {
     tokio::fs::create_dir_all(config.build_dir()).await?;
 
-    let req = fastn_core::http::Request::default();
-
-    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     // Default css and js
     default_build_files(
         config.root.join(".build"),
@@ -21,23 +18,14 @@ pub async fn build(
     .await?;
 
     {
-        let documents = get_documents_for_current_package(&mut req_config).await?;
+        let documents = get_documents_for_current_package(config).await?;
 
         match only_id {
             Some(id) => {
-                return handle_only_id(
-                    id,
-                    &mut req_config,
-                    base_url,
-                    ignore_failed,
-                    test,
-                    documents,
-                )
-                .await
+                return handle_only_id(id, config, base_url, ignore_failed, test, documents).await
             }
             None => {
-                incremental_build(&mut req_config, &documents, base_url, ignore_failed, test)
-                    .await?;
+                incremental_build(config, &documents, base_url, ignore_failed, test).await?;
             }
         }
     }
@@ -208,8 +196,8 @@ fn is_virtual_dep(path: &str) -> bool {
         || path.ends_with("/-/assets.ftd")
 }
 
-async fn handle_dependency_file<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+async fn handle_dependency_file(
+    config: &fastn_core::Config,
     cache: &mut cache::Cache,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
@@ -240,7 +228,7 @@ async fn handle_dependency_file<'a>(
 
 // removes deleted documents from cache and build folder
 fn remove_deleted_documents(
-    config: &mut fastn_core::RequestConfig,
+    config: &fastn_core::Config,
     c: &mut cache::Cache,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
 ) -> fastn_core::Result<()> {
@@ -265,7 +253,7 @@ fn remove_deleted_documents(
         .collect_vec();
 
     for removed_doc_id in &removed_documents {
-        let folder_path = config.config.build_dir().join(removed_doc_id);
+        let folder_path = config.build_dir().join(removed_doc_id);
         let folder_parent = folder_path.parent();
         let file_path = &folder_path.with_extension("ftd");
 
@@ -290,7 +278,7 @@ fn remove_deleted_documents(
 
 #[tracing::instrument(skip(config, documents))]
 async fn incremental_build<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+    config: &fastn_core::Config,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
     ignore_failed: bool,
@@ -323,9 +311,7 @@ async fn incremental_build<'a>(
                 let dependencies: Vec<String> = doc
                     .dependencies
                     .iter()
-                    .map(|dep| {
-                        get_dependency_name_without_package_name(&config.config.package.name, dep)
-                    })
+                    .map(|dep| get_dependency_name_without_package_name(&config.package.name, dep))
                     .collect_vec();
 
                 for dep in &dependencies {
@@ -425,7 +411,7 @@ async fn incremental_build<'a>(
 #[tracing::instrument(skip(config, documents))]
 async fn handle_only_id<'a>(
     id: &str,
-    config: &'a mut fastn_core::RequestConfig<'a>,
+    config: &fastn_core::Config,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -440,13 +426,13 @@ async fn handle_only_id<'a>(
     Err(fastn_core::Error::GenericError(format!(
         "Document {} not found in package {}",
         id,
-        config.config.package.name.as_str()
+        config.package.name.as_str()
     )))
 }
 
 async fn handle_file<'a>(
     document: &fastn_core::File,
-    config: &'a mut fastn_core::RequestConfig<'a>,
+    config: &fastn_core::Config,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
@@ -455,7 +441,7 @@ async fn handle_file<'a>(
 ) -> fastn_core::Result<()> {
     let start = std::time::Instant::now();
     print!("Processing {} ... ", document.get_id_with_package());
-    let package_name = config.config.package.name.to_string();
+    let package_name = config.package.name.to_string();
     let process_status = handle_file_(
         document,
         config,
@@ -572,18 +558,15 @@ fn remove_extension(id: &str) -> String {
 }
 
 #[tracing::instrument(skip(document, config, cache))]
-async fn handle_file_<'a>(
+async fn handle_file_(
     document: &fastn_core::File,
-    config: &'a mut fastn_core::RequestConfig<'a>,
+    config: &fastn_core::Config,
     base_url: &str,
     ignore_failed: bool,
     test: bool,
     build_static_files: bool,
     cache: Option<&mut cache::Cache>,
 ) -> fastn_core::Result<()> {
-    config.current_document = Some(document.get_id().to_string());
-    config.dependencies_during_render = vec![];
-
     match document {
         fastn_core::File::Ftd(doc) => {
             let file_path = if doc.id.eq("404.ftd") {
@@ -600,8 +583,8 @@ async fn handle_file_<'a>(
             }
 
             fastn_core::utils::copy(
-                config.config.root.join(doc.id.as_str()),
-                config.config.root.join(".build").join(doc.id.as_str()),
+                config.root.join(doc.id.as_str()),
+                config.root.join(".build").join(doc.id.as_str()),
             )
             .await
             .ok();
@@ -610,8 +593,12 @@ async fn handle_file_<'a>(
                 return Ok(());
             }
 
+            let mut req_config =
+                fastn_core::RequestConfig::new(&config, &fastn_core::http::Request::default());
+            req_config.current_document = Some(document.get_id().to_string());
+
             let resp = fastn_core::package::package_doc::process_ftd(
-                config,
+                &mut req_config,
                 doc,
                 base_url,
                 build_static_files,
@@ -619,6 +606,9 @@ async fn handle_file_<'a>(
                 file_path.as_str(),
             )
             .await;
+
+            let dependencies = req_config.dependencies_during_render;
+
             match (resp, ignore_failed) {
                 (Ok(r), _) => {
                     if let Some(cache) = cache {
@@ -626,7 +616,7 @@ async fn handle_file_<'a>(
                             remove_extension(doc.id.as_str()),
                             cache::Document {
                                 html_checksum: r.checksum(),
-                                dependencies: config.dependencies_during_render.clone(),
+                                dependencies,
                             },
                         );
                         cache.file_checksum.insert(
@@ -644,27 +634,25 @@ async fn handle_file_<'a>(
                 }
             }
         }
-        fastn_core::File::Static(sa) => {
-            process_static(sa, &config.config.root, &config.config.package).await?
-        }
+        fastn_core::File::Static(sa) => process_static(sa, &config.root, &config.package).await?,
         fastn_core::File::Markdown(_doc) => {
             // TODO: bring this feature back
             print!("Skipped ");
             return Ok(());
         }
         fastn_core::File::Image(main_doc) => {
-            process_static(main_doc, &config.config.root, &config.config.package).await?;
+            process_static(main_doc, &config.root, &config.package).await?;
         }
         fastn_core::File::Code(doc) => {
             process_static(
                 &fastn_core::Static {
-                    package_name: config.config.package.name.to_string(),
+                    package_name: config.package.name.to_string(),
                     id: doc.id.to_string(),
                     content: doc.content.clone().into_bytes(),
                     base_path: camino::Utf8PathBuf::from(doc.parent_path.as_str()),
                 },
-                &config.config.root,
-                &config.config.package,
+                &config.root,
+                &config.package,
             )
             .await?;
         }
@@ -738,30 +726,28 @@ pub async fn default_build_files(
 
 #[tracing::instrument(skip(config))]
 async fn get_documents_for_current_package(
-    config: &mut fastn_core::RequestConfig<'_>,
+    config: &fastn_core::Config,
 ) -> fastn_core::Result<std::collections::BTreeMap<String, fastn_core::File>> {
     let mut documents = std::collections::BTreeMap::from_iter(
         config
-            .config
-            .get_files(&config.config.package)
+            .get_files(&config.package)
             .await?
             .into_iter()
             .map(|v| (v.get_id().to_string(), v)),
     );
 
-    if let Some(ref sitemap) = config.config.package.sitemap {
+    if let Some(ref sitemap) = config.package.sitemap {
         let get_all_locations = sitemap.get_all_locations();
         let mut files: std::collections::HashMap<String, fastn_core::File> = Default::default();
         for (doc_path, _, url) in get_all_locations {
             let file = {
                 let package_name = if let Some(ref url) = url {
-                    config.config.find_package_by_id(url).await?.1.name
+                    config.find_package_by_id(url).await?.1.name
                 } else {
-                    config.config.package.name.to_string()
+                    config.package.name.to_string()
                 };
                 let mut file =
-                    fastn_core::get_file(package_name, doc_path, config.config.root.as_path())
-                        .await?;
+                    fastn_core::get_file(package_name, doc_path, config.root.as_path()).await?;
                 if let Some(ref url) = url {
                     let url = url.replace("/index.html", "");
                     let extension = if matches!(file, fastn_core::File::Markdown(_)) {
diff --git a/foo/Cargo.lock b/foo/Cargo.lock
new file mode 100644
index 0000000000..0e5399e665
--- /dev/null
+++ b/foo/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "foo"
+version = "0.1.0"
diff --git a/foo/Cargo.toml b/foo/Cargo.toml
new file mode 100644
index 0000000000..5a9b78bdf5
--- /dev/null
+++ b/foo/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "foo"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tokio = { version = "1.27.0", features = ["full"] }
diff --git a/foo/src/main.rs b/foo/src/main.rs
new file mode 100644
index 0000000000..12dd8f2939
--- /dev/null
+++ b/foo/src/main.rs
@@ -0,0 +1,24 @@
+fn main() {
+    tokio::runtime::Builder::new_multi_thread()
+        .enable_all()
+        .build()
+        .unwrap()
+        .block_on(outer_main())
+}
+
+async fn outer_main() {
+    let mut i = P { x: 10, y: 20 };
+
+    yo(&mut i).await;
+    println!("Hello, world: {}", i.x);
+}
+
+struct P {
+    x: i32,
+    y: i32,
+}
+
+async fn yo(i: &mut P) {
+    i.x = 20;
+    println!("yo: {}", i.x);
+}

From 222a608300b2a65ea01cd3f2f133a268a69bb89c Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Wed, 1 Nov 2023 12:51:58 +0530
Subject: [PATCH 12/32] does this mean I actually understand rust lifetimes
 now?

---
 fastn-core/src/commands/build.rs        | 39 ++++++++++++++++++++-----
 fastn-core/src/commands/serve.rs        |  8 ++---
 fastn-core/src/config/mod.rs            |  2 +-
 fastn-core/src/doc.rs                   | 10 +++----
 fastn-core/src/library/fastn_dot_ftd.rs |  2 +-
 fastn-core/src/library2022/mod.rs       | 10 +++----
 fastn-core/src/package/package_doc.rs   | 16 +++++-----
 fastn/src/main.rs                       |  2 +-
 foo/src/main.rs                         | 18 ++++++++++--
 9 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index b6a0748aac..9e10ae19db 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -593,24 +593,47 @@ async fn handle_file_(
                 return Ok(());
             }
 
-            let mut req_config =
-                fastn_core::RequestConfig::new(&config, &fastn_core::http::Request::default());
+            let req = fastn_core::http::Request::default();
+            let mut req_config = fastn_core::RequestConfig::new(&config, &req);
             req_config.current_document = Some(document.get_id().to_string());
 
-            let resp = fastn_core::package::package_doc::process_ftd(
-                &mut req_config,
-                doc,
+            async fn f<'a>(
+                mut req_config: fastn_core::RequestConfig<'a>,
+                base_url: &str,
+                test: bool,
+                doc: &fastn_core::Document,
+                file_path: &str,
+                build_static_files: bool,
+            ) -> (
+                fastn_core::RequestConfig<'a>,
+                fastn_core::Result<fastn_core::package::package_doc::FTDResult>,
+            ) {
+                let resp = fastn_core::package::package_doc::process_ftd(
+                    &mut req_config,
+                    doc,
+                    base_url,
+                    build_static_files,
+                    test,
+                    file_path,
+                )
+                .await;
+
+                (req_config, resp)
+            }
+
+            let (req_config, resp) = f(
+                req_config,
                 base_url,
-                build_static_files,
                 test,
+                doc,
                 file_path.as_str(),
+                build_static_files,
             )
             .await;
 
-            let dependencies = req_config.dependencies_during_render;
-
             match (resp, ignore_failed) {
                 (Ok(r), _) => {
+                    let dependencies = req_config.dependencies_during_render;
                     if let Some(cache) = cache {
                         cache.documents.insert(
                             remove_extension(doc.id.as_str()),
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index e6cb756de0..96decd59e1 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,8 +18,8 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+async fn serve_file<'m, 'o: 'm>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
     if let Some(r) = handle_redirect(config.config, path) {
@@ -123,8 +123,8 @@ async fn serve_file<'a>(
     }
 }
 
-async fn serve_cr_file<'a>(
-    req_config: &'a mut fastn_core::RequestConfig<'a>,
+async fn serve_cr_file<'m, 'o: 'm>(
+    req_config: &'m mut fastn_core::RequestConfig<'o>,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
diff --git a/fastn-core/src/config/mod.rs b/fastn-core/src/config/mod.rs
index 9694fbf629..7f24f1453f 100644
--- a/fastn-core/src/config/mod.rs
+++ b/fastn-core/src/config/mod.rs
@@ -54,7 +54,7 @@ pub struct RequestConfig<'a> {
 }
 
 impl<'a> RequestConfig<'a> {
-    pub fn new(config: &Config, request: &fastn_core::http::Request) -> Self {
+    pub fn new(config: &'a Config, request: &'a fastn_core::http::Request) -> Self {
         RequestConfig {
             named_parameters: vec![],
             extra_data: Default::default(),
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index 381c87465c..175c16c18b 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -29,7 +29,7 @@ fn cached_parse(
 pub async fn interpret_helper<'a>(
     name: &str,
     source: &str,
-    lib: &'a mut fastn_core::Library2022<'_>,
+    lib: &'a mut fastn_core::Library2022<'_, '_>,
     base_url: &str,
     download_assets: bool,
     line_number: usize,
@@ -160,7 +160,7 @@ pub async fn resolve_import<'a>(
 
 // source, foreign_variable, foreign_function
 pub async fn resolve_import_2022<'a>(
-    lib: &'a mut fastn_core::Library2022<'_>,
+    lib: &'a mut fastn_core::Library2022<'_, '_>,
     _state: &mut ftd::interpreter::InterpreterState,
     module: &str,
     caller_module: &str,
@@ -291,7 +291,7 @@ pub async fn resolve_import_2022<'a>(
 pub async fn resolve_foreign_variable2022(
     variable: &str,
     doc_name: &str,
-    lib: &mut fastn_core::Library2022<'_>,
+    lib: &mut fastn_core::Library2022<'_, '_>,
     base_url: &str,
     download_assets: bool,
     caller_module: &str,
@@ -353,7 +353,7 @@ pub async fn resolve_foreign_variable2022(
         module: &str,
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2022<'_>,
+        lib: &mut fastn_core::Library2022<'_, '_>,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::interpreter::Value> {
@@ -547,7 +547,7 @@ pub async fn resolve_foreign_variable2022(
 }
 
 async fn download(
-    lib: &mut fastn_core::Library2022<'_>,
+    lib: &mut fastn_core::Library2022<'_, '_>,
     download_assets: bool,
     package: &fastn_core::Package,
     path: &str,
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index adf7e018dd..281a93798e 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -824,7 +824,7 @@ pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
     get(&lib).await
 }
 
-pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_>) -> String {
+pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_, '_>) -> String {
     let lib = fastn_core::Library {
         config: lib.config.clone(),
         markdown: lib.markdown.clone(),
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 20e5ef142e..8641cc8e85 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -14,8 +14,8 @@ impl KeyValueData {
 }
 
 #[derive(Debug)]
-pub struct Library2022<'a> {
-    pub config: &'a mut fastn_core::RequestConfig<'a>,
+pub struct Library2022<'m, 'o: 'm> {
+    pub config: &'m mut fastn_core::RequestConfig<'o>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -25,7 +25,7 @@ pub struct Library2022<'a> {
     pub module_package_map: std::collections::BTreeMap<String, String>,
 }
 
-impl Library2022<'_> {
+impl Library2022<'_, '_> {
     pub async fn get_with_result(
         &mut self,
         name: &str,
@@ -86,7 +86,7 @@ impl Library2022<'_> {
 
         async fn get_for_package(
             name: &str,
-            lib: &mut fastn_core::Library2022<'_>,
+            lib: &mut fastn_core::Library2022<'_, '_>,
             current_processing_module: &str,
         ) -> Option<(String, String, usize)> {
             let package = lib.get_current_package(current_processing_module).ok()?;
@@ -150,7 +150,7 @@ impl Library2022<'_> {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut fastn_core::Library2022<'_>,
+            lib: &mut fastn_core::Library2022<'_, '_>,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
             let packages = lib.config.config.all_packages.borrow();
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index a98862455b..2a0b71b9ae 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+pub(crate) async fn read_ftd<'m, 'o: 'm>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,8 +385,8 @@ pub(crate) async fn read_ftd<'a>(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+pub(crate) async fn read_ftd_2022<'m, 'o: 'm>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -460,8 +460,8 @@ pub(crate) async fn read_ftd_2022<'a>(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+pub(crate) async fn read_ftd_2023<'m, 'o: 'm>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -541,8 +541,8 @@ pub(crate) async fn read_ftd_2023<'a>(
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd<'a>(
-    config: &'a mut fastn_core::RequestConfig<'a>,
+pub(crate) async fn process_ftd<'m, 'o: 'm>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
diff --git a/fastn/src/main.rs b/fastn/src/main.rs
index 98932529cc..00216f1630 100644
--- a/fastn/src/main.rs
+++ b/fastn/src/main.rs
@@ -88,7 +88,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
         return fastn_core::tutor::main("the-tutor".to_string()).await;
     }
 
-    let mut config = fastn_core::Config::read(None, true, None).await?;
+    let mut config = fastn_core::Config::read(None, true).await?;
     let package_name = config.package.name.clone();
 
     if let Some(serve) = matches.subcommand_matches("serve") {
diff --git a/foo/src/main.rs b/foo/src/main.rs
index 12dd8f2939..00061b16fd 100644
--- a/foo/src/main.rs
+++ b/foo/src/main.rs
@@ -7,18 +7,30 @@ fn main() {
 }
 
 async fn outer_main() {
-    let mut i = P { x: 10, y: 20 };
+    let mut i = P { x: 10 };
 
     yo(&mut i).await;
-    println!("Hello, world: {}", i.x);
+
+    let mut q = Q { p: &mut i };
+    bo(&mut q).await;
+
+    println!("Hello, world: {}", q.p.x);
 }
 
 struct P {
     x: i32,
-    y: i32,
+}
+
+struct Q<'a> {
+    p: &'a mut P,
 }
 
 async fn yo(i: &mut P) {
     i.x = 20;
     println!("yo: {}", i.x);
 }
+
+async fn bo<'m, 'o: 'm>(i: &'m mut Q<'o>) {
+    i.p.x = 30;
+    println!("bo: {}", i.p.x);
+}

From 58a32dfb996bc38064d9818315a6f49d8dfae701 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Wed, 1 Nov 2023 12:55:45 +0530
Subject: [PATCH 13/32] cargo clippy --fix

---
 fastn-core/src/apis/edit.rs             |  2 +-
 fastn-core/src/apis/edit_source.rs      |  2 +-
 fastn-core/src/apis/view_source.rs      |  2 +-
 fastn-core/src/commands/build.rs        |  2 +-
 fastn-core/src/commands/serve.rs        |  4 +--
 fastn-core/src/library/fastn_dot_ftd.rs |  8 ++---
 fastn-core/src/library2022/mod.rs       | 42 ++++++++++++-------------
 ftd/src/ftd2021/p1/parser.rs            |  4 +--
 ftd/src/p1/test.rs                      | 12 +++----
 9 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/fastn-core/src/apis/edit.rs b/fastn-core/src/apis/edit.rs
index dd4857377a..60e72893ea 100644
--- a/fastn-core/src/apis/edit.rs
+++ b/fastn-core/src/apis/edit.rs
@@ -32,7 +32,7 @@ pub async fn edit(
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
-    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req);
     req_config.current_document = Some(req_data.path.to_string());
 
     match req_config.can_write(req_data.path.as_str()).await {
diff --git a/fastn-core/src/apis/edit_source.rs b/fastn-core/src/apis/edit_source.rs
index 269e9c16e0..40b62c0ddd 100644
--- a/fastn-core/src/apis/edit_source.rs
+++ b/fastn-core/src/apis/edit_source.rs
@@ -22,7 +22,7 @@ async fn handle_view_source(
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
     let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req);
 
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
diff --git a/fastn-core/src/apis/view_source.rs b/fastn-core/src/apis/view_source.rs
index e86ede1338..3aa2f2d7bd 100644
--- a/fastn-core/src/apis/view_source.rs
+++ b/fastn-core/src/apis/view_source.rs
@@ -22,7 +22,7 @@ async fn handle_view_source(
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
     let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req);
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
 
diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 9e10ae19db..8449e082f2 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -594,7 +594,7 @@ async fn handle_file_(
             }
 
             let req = fastn_core::http::Request::default();
-            let mut req_config = fastn_core::RequestConfig::new(&config, &req);
+            let mut req_config = fastn_core::RequestConfig::new(config, &req);
             req_config.current_document = Some(document.get_id().to_string());
 
             async fn f<'a>(
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 96decd59e1..e92ba2bbd7 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -245,7 +245,7 @@ pub async fn serve(
     let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse()?;
 
     Ok(if path.eq(&camino::Utf8PathBuf::new().join("FASTN.ftd")) {
-        serve_fastn_file(&config).await
+        serve_fastn_file(config).await
     } else if path.eq(&camino::Utf8PathBuf::new().join("")) {
         serve_file(&mut req_config, &path.join("/")).await
     } else if let Some(cr_number) = fastn_core::cr::get_cr_path_from_url(path.as_str()) {
@@ -323,7 +323,7 @@ pub async fn serve(
             // Already checked in the above method serve_file
             tracing::info!("executing proxy: path: {}", &path);
             let (package_name, url, mut conf) =
-                fastn_core::config::utils::get_clean_url(&config, path.as_str())?;
+                fastn_core::config::utils::get_clean_url(config, path.as_str())?;
             let package_name = package_name.unwrap_or_else(|| config.package.name.to_string());
 
             let host = if let Some(port) = url.port() {
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index 281a93798e..0d2e19191b 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -19,7 +19,7 @@ async fn i18n_data(lib: &fastn_core::Library<'_>) -> String {
 
     let current_document_last_modified_on =
         fastn_core::utils::get_current_document_last_modified_on(
-            &lib.config.config,
+            lib.config.config,
             lib.document_id.as_str(),
         )
         .await;
@@ -267,7 +267,7 @@ pub(crate) async fn get2022_(lib: &fastn_core::Library<'_>) -> String {
     );
 
     if let Ok(number_of_documents) = futures::executor::block_on(
-        fastn_core::utils::get_number_of_documents(&lib.config.config),
+        fastn_core::utils::get_number_of_documents(lib.config.config),
     ) {
         fastn_base = format!(
             indoc::indoc! {"
@@ -406,7 +406,7 @@ pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
     }
 
     if let Ok(number_of_documents) = futures::executor::block_on(
-        fastn_core::utils::get_number_of_documents(&lib.config.config),
+        fastn_core::utils::get_number_of_documents(lib.config.config),
     ) {
         fastn_base = format!(
             indoc::indoc! {"
@@ -435,7 +435,7 @@ pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
 
     if let Some(last_modified_on) =
         futures::executor::block_on(fastn_core::utils::get_current_document_last_modified_on(
-            &lib.config.config,
+            lib.config.config,
             lib.document_id.as_str(),
         ))
     {
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 8641cc8e85..85f9ea91d4 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -243,63 +243,63 @@ impl Library2022<'_, '_> {
             "figma-cs-token-old" => {
                 processor::figma_tokens::process_figma_tokens_old(value, kind, doc)
             }
-            "http" => processor::http::process(value, kind, doc, &self.config).await,
+            "http" => processor::http::process(value, kind, doc, self.config).await,
             "tutor" => fastn_core::tutor::process(value, kind, doc).await,
             "toc" => processor::toc::process(value, kind, doc),
-            "get-data" => processor::get_data::process(value, kind, doc, &self.config),
-            "sitemap" => processor::sitemap::process(value, kind, doc, &self.config),
+            "get-data" => processor::get_data::process(value, kind, doc, self.config),
+            "sitemap" => processor::sitemap::process(value, kind, doc, self.config),
             "full-sitemap" => {
-                processor::sitemap::full_sitemap_process(value, kind, doc, &self.config)
+                processor::sitemap::full_sitemap_process(value, kind, doc, self.config)
             }
-            "request-data" => processor::request_data::process(value, kind, doc, &self.config),
+            "request-data" => processor::request_data::process(value, kind, doc, self.config),
             "document-readers" => processor::document::process_readers(
                 value,
                 kind,
                 doc,
-                &self.config,
+                self.config,
                 self.document_id.as_str(),
             ),
             "document-writers" => processor::document::process_writers(
                 value,
                 kind,
                 doc,
-                &self.config,
+                self.config,
                 self.document_id.as_str(),
             ),
-            "user-groups" => processor::user_group::process(value, kind, doc, &self.config),
+            "user-groups" => processor::user_group::process(value, kind, doc, self.config),
             "user-group-by-id" => {
-                processor::user_group::process_by_id(value, kind, doc, &self.config)
+                processor::user_group::process_by_id(value, kind, doc, self.config)
             }
             "get-identities" => {
-                processor::user_group::get_identities(value, kind, doc, &self.config)
+                processor::user_group::get_identities(value, kind, doc, self.config)
             }
-            "document-id" => processor::document::document_id(value, kind, doc, &self.config),
+            "document-id" => processor::document::document_id(value, kind, doc, self.config),
             "document-full-id" => {
-                processor::document::document_full_id(value, kind, doc, &self.config)
+                processor::document::document_full_id(value, kind, doc, self.config)
             }
             "document-suffix" => {
-                processor::document::document_suffix(value, kind, doc, &self.config)
+                processor::document::document_suffix(value, kind, doc, self.config)
             }
             "document-name" => {
-                processor::document::document_name(value, kind, doc, &self.config).await
+                processor::document::document_name(value, kind, doc, self.config).await
             }
             "fetch-file" => {
-                processor::fetch_file::fetch_files(value, kind, doc, &self.config).await
+                processor::fetch_file::fetch_files(value, kind, doc, self.config).await
             }
-            "user-details" => processor::user_details::process(value, kind, doc, &self.config),
-            "fastn-apps" => processor::apps::process(value, kind, doc, &self.config),
-            "is-reader" => processor::user_group::is_reader(value, kind, doc, &self.config).await,
-            "package-query" => processor::sqlite::process(value, kind, doc, &self.config).await,
+            "user-details" => processor::user_details::process(value, kind, doc, self.config),
+            "fastn-apps" => processor::apps::process(value, kind, doc, self.config),
+            "is-reader" => processor::user_group::is_reader(value, kind, doc, self.config).await,
+            "package-query" => processor::sqlite::process(value, kind, doc, self.config).await,
             "pg" => processor::pg::process(value, kind, doc).await,
             "package-tree" => {
-                processor::package_tree::process(value, kind, doc, &self.config.config).await
+                processor::package_tree::process(value, kind, doc, self.config.config).await
             }
             "query" => {
                 processor::query::process(
                     value,
                     kind,
                     doc,
-                    &mut self.config,
+                    self.config,
                     self.document_id.as_str(),
                 )
                 .await
diff --git a/ftd/src/ftd2021/p1/parser.rs b/ftd/src/ftd2021/p1/parser.rs
index 056399fb3f..258d60930e 100644
--- a/ftd/src/ftd2021/p1/parser.rs
+++ b/ftd/src/ftd2021/p1/parser.rs
@@ -815,15 +815,13 @@ mod test {
             ),
             super::Section::with_name("hello")
                 .add_sub_section(super::SubSection::with_name("realm.rr.step.body").and_body(
-                    &indoc!(
-                        r#"
+                    r#"
                         {
                           "body": "-- h0: Hello World\n\n-- markup:\n\ndemo cr 1\n",
                           "kind": "content",
                           "track": "amitu/index",
                           "version": "2020-11-16T04:13:14.642892+00:00"
                         }"#
-                    )
                 ))
                 .list()
         );
diff --git a/ftd/src/p1/test.rs b/ftd/src/p1/test.rs
index 1089d74872..e6d16dc357 100644
--- a/ftd/src/p1/test.rs
+++ b/ftd/src/p1/test.rs
@@ -455,15 +455,13 @@ fn with_dash_dash() {
         ),
         &ftd::p1::Section::with_name("hello")
             .add_sub_section(
-                ftd::p1::Section::with_name("realm.rr.step.body").and_body(&indoc!(
-                    r#"
+                ftd::p1::Section::with_name("realm.rr.step.body").and_body(r#"
                         {
                           "body": "-- h0: Hello World\n\n-- markup:\n\ndemo cr 1\n",
                           "kind": "content",
                           "track": "amitu/index",
                           "version": "2020-11-16T04:13:14.642892+00:00"
-                        }"#,
-                )),
+                        }"#),
             )
             .list(),
     );
@@ -472,8 +470,7 @@ fn with_dash_dash() {
 #[test]
 fn indented_body() {
     p(
-        &indoc!(
-            "
+        "
                  -- markup:
 
                  hello world is
@@ -481,8 +478,7 @@ fn indented_body() {
                      not enough
 
                      lol
-            "
-        ),
+            ",
         &ftd::p1::Section::with_name("markup")
             .and_body("hello world is\n\n    not enough\n\n    lol")
             .list(),

From e237d1f185ddd659dba1198045a793d19b9515d5 Mon Sep 17 00:00:00 2001
From: Arpita-Jaiswal <ayushipujaa@gmail.com>
Date: Thu, 2 Nov 2023 13:29:24 +0530
Subject: [PATCH 14/32] Small refactor

---
 fastn-core/src/commands/build.rs | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 8449e082f2..3e67bf8ceb 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -597,37 +597,13 @@ async fn handle_file_(
             let mut req_config = fastn_core::RequestConfig::new(config, &req);
             req_config.current_document = Some(document.get_id().to_string());
 
-            async fn f<'a>(
-                mut req_config: fastn_core::RequestConfig<'a>,
-                base_url: &str,
-                test: bool,
-                doc: &fastn_core::Document,
-                file_path: &str,
-                build_static_files: bool,
-            ) -> (
-                fastn_core::RequestConfig<'a>,
-                fastn_core::Result<fastn_core::package::package_doc::FTDResult>,
-            ) {
-                let resp = fastn_core::package::package_doc::process_ftd(
-                    &mut req_config,
-                    doc,
-                    base_url,
-                    build_static_files,
-                    test,
-                    file_path,
-                )
-                .await;
-
-                (req_config, resp)
-            }
-
-            let (req_config, resp) = f(
-                req_config,
+            let resp = fastn_core::package::package_doc::process_ftd(
+                &mut req_config,
+                doc,
                 base_url,
+                build_static_files,
                 test,
-                doc,
                 file_path.as_str(),
-                build_static_files,
             )
             .await;
 

From 9b0baacaee93cccaf9a1749e14faaf188760bee0 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Thu, 2 Nov 2023 17:35:19 +0530
Subject: [PATCH 15/32] removed some un-needed lifetimes

---
 fastn-core/src/commands/build.rs      |  6 +++---
 fastn-core/src/commands/serve.rs      |  8 ++++----
 fastn-core/src/package/package_doc.rs | 16 ++++++++--------
 foo/src/main.rs                       |  7 ++++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 3e67bf8ceb..9b9341559e 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -277,7 +277,7 @@ fn remove_deleted_documents(
 }
 
 #[tracing::instrument(skip(config, documents))]
-async fn incremental_build<'a>(
+async fn incremental_build(
     config: &fastn_core::Config,
     documents: &std::collections::BTreeMap<String, fastn_core::File>,
     base_url: &str,
@@ -409,7 +409,7 @@ async fn incremental_build<'a>(
 }
 
 #[tracing::instrument(skip(config, documents))]
-async fn handle_only_id<'a>(
+async fn handle_only_id(
     id: &str,
     config: &fastn_core::Config,
     base_url: &str,
@@ -430,7 +430,7 @@ async fn handle_only_id<'a>(
     )))
 }
 
-async fn handle_file<'a>(
+async fn handle_file(
     document: &fastn_core::File,
     config: &fastn_core::Config,
     base_url: &str,
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index e92ba2bbd7..342cd58626 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,8 +18,8 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file<'m, 'o: 'm>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+async fn serve_file(
+    config: &mut fastn_core::RequestConfig<'_>,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
     if let Some(r) = handle_redirect(config.config, path) {
@@ -123,8 +123,8 @@ async fn serve_file<'m, 'o: 'm>(
     }
 }
 
-async fn serve_cr_file<'m, 'o: 'm>(
-    req_config: &'m mut fastn_core::RequestConfig<'o>,
+async fn serve_cr_file(
+    req_config: &mut fastn_core::RequestConfig<'_>,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index 2a0b71b9ae..bae826f7a0 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd<'m, 'o: 'm>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd(
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,8 +385,8 @@ pub(crate) async fn read_ftd<'m, 'o: 'm>(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022<'m, 'o: 'm>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd_2022(
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -460,8 +460,8 @@ pub(crate) async fn read_ftd_2022<'m, 'o: 'm>(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023<'m, 'o: 'm>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd_2023(
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -541,8 +541,8 @@ pub(crate) async fn read_ftd_2023<'m, 'o: 'm>(
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd<'m, 'o: 'm>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn process_ftd(
+    config: &mut fastn_core::RequestConfig<'_>,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
diff --git a/foo/src/main.rs b/foo/src/main.rs
index 00061b16fd..24c7704086 100644
--- a/foo/src/main.rs
+++ b/foo/src/main.rs
@@ -30,7 +30,8 @@ async fn yo(i: &mut P) {
     println!("yo: {}", i.x);
 }
 
-async fn bo<'m, 'o: 'm>(i: &'m mut Q<'o>) {
-    i.p.x = 30;
-    println!("bo: {}", i.p.x);
+async fn bo(q: &mut Q<'_>) {
+    // q.p = &mut P { x: 30 };
+    q.p.x = 30;
+    println!("bo: {}", q.p.x);
 }

From 8abc42f4910de203f8bc6738d489102b78bffe7d Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Thu, 2 Nov 2023 17:50:18 +0530
Subject: [PATCH 16/32] some tweaks, probably more buggy, still doesnt compile
 :-(

---
 fastn-core/src/commands/build.rs        |  4 +++-
 fastn-core/src/commands/serve.rs        |  9 ++++-----
 fastn-core/src/doc.rs                   | 10 +++++-----
 fastn-core/src/library/fastn_dot_ftd.rs |  2 +-
 fastn-core/src/library2022/mod.rs       | 10 +++++-----
 fastn-core/src/package/package_doc.rs   | 16 ++++++++--------
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index 9b9341559e..b674b96bc1 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -609,7 +609,9 @@ async fn handle_file_(
 
             match (resp, ignore_failed) {
                 (Ok(r), _) => {
-                    let dependencies = req_config.dependencies_during_render;
+                    // TODO: what to do with dependencies?
+                    // let dependencies = req_config.dependencies_during_render;
+                    let dependencies = vec![];
                     if let Some(cache) = cache {
                         cache.documents.insert(
                             remove_extension(doc.id.as_str()),
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 342cd58626..5f4155b2f5 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,8 +18,8 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file(
-    config: &mut fastn_core::RequestConfig<'_>,
+async fn serve_file<'o, 'm: 'o>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
     if let Some(r) = handle_redirect(config.config, path) {
@@ -123,8 +123,8 @@ async fn serve_file(
     }
 }
 
-async fn serve_cr_file(
-    req_config: &mut fastn_core::RequestConfig<'_>,
+async fn serve_cr_file<'o, 'm: 'o>(
+    req_config: &'m mut fastn_core::RequestConfig<'o>,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
@@ -241,7 +241,6 @@ pub async fn serve(
 
     let mut req_config = fastn_core::RequestConfig::new(config, &req);
 
-    // TODO: remove unwrap
     let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse()?;
 
     Ok(if path.eq(&camino::Utf8PathBuf::new().join("FASTN.ftd")) {
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index e488de90e8..b6da5feab3 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -29,7 +29,7 @@ fn cached_parse(
 pub async fn interpret_helper<'a>(
     name: &str,
     source: &str,
-    lib: &'a mut fastn_core::Library2022<'_, '_>,
+    lib: &'a mut fastn_core::Library2022<'_>,
     base_url: &str,
     download_assets: bool,
     line_number: usize,
@@ -160,7 +160,7 @@ pub async fn resolve_import<'a>(
 
 // source, foreign_variable, foreign_function
 pub async fn resolve_import_2022<'a>(
-    lib: &'a mut fastn_core::Library2022<'_, '_>,
+    lib: &'a mut fastn_core::Library2022<'_>,
     _state: &mut ftd::interpreter::InterpreterState,
     module: &str,
     caller_module: &str,
@@ -293,7 +293,7 @@ pub async fn resolve_import_2022<'a>(
 pub async fn resolve_foreign_variable2022(
     variable: &str,
     doc_name: &str,
-    lib: &mut fastn_core::Library2022<'_, '_>,
+    lib: &mut fastn_core::Library2022<'_>,
     base_url: &str,
     download_assets: bool,
     caller_module: &str,
@@ -355,7 +355,7 @@ pub async fn resolve_foreign_variable2022(
         module: &str,
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2022<'_, '_>,
+        lib: &mut fastn_core::Library2022<'_>,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::interpreter::Value> {
@@ -549,7 +549,7 @@ pub async fn resolve_foreign_variable2022(
 }
 
 async fn download(
-    lib: &mut fastn_core::Library2022<'_, '_>,
+    lib: &mut fastn_core::Library2022<'_>,
     download_assets: bool,
     package: &fastn_core::Package,
     path: &str,
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index 0d2e19191b..b12c74200c 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -824,7 +824,7 @@ pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
     get(&lib).await
 }
 
-pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_, '_>) -> String {
+pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_>) -> String {
     let lib = fastn_core::Library {
         config: lib.config.clone(),
         markdown: lib.markdown.clone(),
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 5c50219607..8521d4b132 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -14,8 +14,8 @@ impl KeyValueData {
 }
 
 #[derive(Debug)]
-pub struct Library2022<'m, 'o: 'm> {
-    pub config: &'m mut fastn_core::RequestConfig<'o>,
+pub struct Library2022<'m> {
+    pub config: &'m mut fastn_core::RequestConfig<'m>,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -25,7 +25,7 @@ pub struct Library2022<'m, 'o: 'm> {
     pub module_package_map: std::collections::BTreeMap<String, String>,
 }
 
-impl Library2022<'_, '_> {
+impl Library2022<'_> {
     pub async fn get_with_result(
         &mut self,
         name: &str,
@@ -86,7 +86,7 @@ impl Library2022<'_, '_> {
 
         async fn get_for_package(
             name: &str,
-            lib: &mut fastn_core::Library2022<'_, '_>,
+            lib: &mut fastn_core::Library2022<'_>,
             current_processing_module: &str,
         ) -> Option<(String, String, usize)> {
             let package = lib.get_current_package(current_processing_module).ok()?;
@@ -150,7 +150,7 @@ impl Library2022<'_, '_> {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut fastn_core::Library2022<'_, '_>,
+            lib: &mut fastn_core::Library2022<'_>,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
             let packages = lib.config.config.all_packages.borrow();
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index bae826f7a0..60a772ce42 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd<'o, 'm: 'o>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,8 +385,8 @@ pub(crate) async fn read_ftd(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd_2022<'o, 'm: 'o>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -460,8 +460,8 @@ pub(crate) async fn read_ftd_2022(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn read_ftd_2023<'o, 'm: 'o>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -541,8 +541,8 @@ pub(crate) async fn read_ftd_2023(
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd(
-    config: &mut fastn_core::RequestConfig<'_>,
+pub(crate) async fn process_ftd<'o, 'm: 'o>(
+    config: &'m mut fastn_core::RequestConfig<'o>,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,

From 870e268c7113bab8a34230f393507365434a1190 Mon Sep 17 00:00:00 2001
From: Arpita-Jaiswal <ayushipujaa@gmail.com>
Date: Fri, 3 Nov 2023 18:24:21 +0530
Subject: [PATCH 17/32] move Library2023 data to RequestConfig

---
 fastn-core/src/apis/cr.rs                     |  4 +-
 fastn-core/src/apis/edit.rs                   |  2 +-
 fastn-core/src/apis/edit_source.rs            |  2 +-
 fastn-core/src/apis/view_source.rs            |  2 +-
 fastn-core/src/commands/build.rs              |  3 +-
 fastn-core/src/commands/serve.rs              |  2 +-
 fastn-core/src/config/mod.rs                  | 19 +++-
 fastn-core/src/doc.rs                         | 35 ++-----
 fastn-core/src/library/fastn_dot_ftd.rs       |  2 +-
 fastn-core/src/library2022/mod.rs             | 95 ++++++-------------
 fastn-core/src/library2022/processor/query.rs |  7 +-
 fastn-core/src/package/package_doc.rs         | 24 ++---
 12 files changed, 75 insertions(+), 122 deletions(-)

diff --git a/fastn-core/src/apis/cr.rs b/fastn-core/src/apis/cr.rs
index a147926d70..7b131387ce 100644
--- a/fastn-core/src/apis/cr.rs
+++ b/fastn-core/src/apis/cr.rs
@@ -49,7 +49,6 @@ async fn create_cr_page_worker(
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, &req);
     let create_cr_ftd = fastn_core::package_info_create_cr(&config)?;
 
     let main_document = fastn_core::Document {
@@ -59,6 +58,9 @@ async fn create_cr_page_worker(
         package_name: config.package.name.clone(),
     };
 
+    let mut req_config =
+        fastn_core::RequestConfig::new(&config, &req, main_document.id.as_str(), "/");
+
     fastn_core::package::package_doc::read_ftd(&mut req_config, &main_document, "/", false, false)
         .await
         .map(Into::into)
diff --git a/fastn-core/src/apis/edit.rs b/fastn-core/src/apis/edit.rs
index 60e72893ea..75f3ae04b6 100644
--- a/fastn-core/src/apis/edit.rs
+++ b/fastn-core/src/apis/edit.rs
@@ -32,7 +32,7 @@ pub async fn edit(
         Ok(config) => config,
         Err(err) => return fastn_core::http::api_error(err.to_string()),
     };
-    let mut req_config = fastn_core::RequestConfig::new(&config, req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req, "edit.ftd", "/");
     req_config.current_document = Some(req_data.path.to_string());
 
     match req_config.can_write(req_data.path.as_str()).await {
diff --git a/fastn-core/src/apis/edit_source.rs b/fastn-core/src/apis/edit_source.rs
index 40b62c0ddd..ad3f060bd4 100644
--- a/fastn-core/src/apis/edit_source.rs
+++ b/fastn-core/src/apis/edit_source.rs
@@ -22,7 +22,7 @@ async fn handle_view_source(
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
     let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req, "editor-source.ftd", "/");
 
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
diff --git a/fastn-core/src/apis/view_source.rs b/fastn-core/src/apis/view_source.rs
index 3aa2f2d7bd..bba3dcd823 100644
--- a/fastn-core/src/apis/view_source.rs
+++ b/fastn-core/src/apis/view_source.rs
@@ -22,7 +22,7 @@ async fn handle_view_source(
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
     let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, req);
+    let mut req_config = fastn_core::RequestConfig::new(&config, req, "editor.ftd", "/");
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
 
diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index b674b96bc1..dc5b380fc7 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -594,7 +594,8 @@ async fn handle_file_(
             }
 
             let req = fastn_core::http::Request::default();
-            let mut req_config = fastn_core::RequestConfig::new(config, &req);
+            let mut req_config =
+                fastn_core::RequestConfig::new(config, &req, doc.id.as_str(), base_url);
             req_config.current_document = Some(document.get_id().to_string());
 
             let resp = fastn_core::package::package_doc::process_ftd(
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 5f4155b2f5..8c69eca160 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -239,7 +239,7 @@ pub async fn serve(
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
 
-    let mut req_config = fastn_core::RequestConfig::new(config, &req);
+    let mut req_config = fastn_core::RequestConfig::new(config, &req, "", "/");
 
     let path: camino::Utf8PathBuf = req.path().replacen('/', "", 1).parse()?;
 
diff --git a/fastn-core/src/config/mod.rs b/fastn-core/src/config/mod.rs
index 7f24f1453f..982bf4d5a2 100644
--- a/fastn-core/src/config/mod.rs
+++ b/fastn-core/src/config/mod.rs
@@ -51,10 +51,22 @@ pub struct RequestConfig<'a> {
     pub dependencies_during_render: Vec<String>,
     pub request: &'a fastn_core::http::Request,
     pub config: &'a Config,
+    /// If the current module being parsed is a markdown file, `.markdown` contains the name and
+    /// content of that file
+    pub markdown: Option<(String, String)>,
+    pub document_id: String,
+    pub translated_data: fastn_core::TranslationData,
+    pub base_url: String,
+    pub module_package_map: std::collections::BTreeMap<String, String>,
 }
 
 impl<'a> RequestConfig<'a> {
-    pub fn new(config: &'a Config, request: &'a fastn_core::http::Request) -> Self {
+    pub fn new(
+        config: &'a Config,
+        request: &'a fastn_core::http::Request,
+        document_id: &str,
+        base_url: &str,
+    ) -> Self {
         RequestConfig {
             named_parameters: vec![],
             extra_data: Default::default(),
@@ -63,6 +75,11 @@ impl<'a> RequestConfig<'a> {
             dependencies_during_render: vec![],
             request,
             config,
+            markdown: None,
+            document_id: document_id.to_string(),
+            translated_data: Default::default(),
+            base_url: base_url.to_string(),
+            module_package_map: Default::default(),
         }
     }
 
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index b6da5feab3..3dd32177f4 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -39,7 +39,7 @@ pub async fn interpret_helper<'a>(
     let mut s = ftd::interpreter::interpret_with_line_number(name, doc, line_number)?;
     lib.module_package_map.insert(
         name.trim_matches('/').to_string(),
-        lib.config.config.package.name.to_string(),
+        lib.config.package.name.to_string(),
     );
     let document;
     loop {
@@ -56,7 +56,7 @@ pub async fn interpret_helper<'a>(
                 let (source, path, foreign_variable, foreign_function, ignore_line_numbers) =
                     resolve_import_2022(lib, &mut st, module.as_str(), caller_module.as_str())
                         .await?;
-                lib.config.dependencies_during_render.push(path);
+                lib.dependencies_during_render.push(path);
                 let doc = cached_parse(module.as_str(), source.as_str(), ignore_line_numbers)?;
                 s = st.continue_after_import(
                     module.as_str(),
@@ -229,7 +229,6 @@ pub async fn resolve_import_2022<'a>(
                 if module.starts_with(alias) {
                     lib.push_package_under_process(module, package).await?;
                     font_ftd = lib
-                        .config
                         .config
                         .all_packages
                         .borrow()
@@ -326,7 +325,6 @@ pub async fn resolve_foreign_variable2022(
             if alias.eq(&package_name) {
                 lib.push_package_under_process(doc_name, package).await?;
                 let package = lib
-                    .config
                     .config
                     .all_packages
                     .borrow()
@@ -355,7 +353,7 @@ pub async fn resolve_foreign_variable2022(
         module: &str,
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2022<'_>,
+        lib: &mut fastn_core::RequestConfig<'_>,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::interpreter::Value> {
@@ -395,7 +393,6 @@ pub async fn resolve_foreign_variable2022(
                 let light_path = format!("{}.{}", file.replace('.', "/"), ext);
                 if download_assets
                     && !lib
-                        .config
                         .downloaded_assets
                         .contains_key(&format!("{}/{}", package.name, light_path))
                 {
@@ -410,11 +407,7 @@ pub async fn resolve_foreign_variable2022(
                         })?;
                     print!("Processing {}/{} ... ", package.name.as_str(), light_path);
                     fastn_core::utils::write(
-                        &lib.config
-                            .config
-                            .build_dir()
-                            .join("-")
-                            .join(package.name.as_str()),
+                        &lib.config.build_dir().join("-").join(package.name.as_str()),
                         light_path.as_str(),
                         light.as_slice(),
                     )
@@ -424,7 +417,7 @@ pub async fn resolve_foreign_variable2022(
                         doc_id: lib.document_id.to_string(),
                         line_number: 0,
                     })?;
-                    lib.config.downloaded_assets.insert(
+                    lib.downloaded_assets.insert(
                         format!("{}/{}", package.name, light_path),
                         light_mode.to_string(),
                     );
@@ -457,7 +450,6 @@ pub async fn resolve_foreign_variable2022(
                 if download_assets && !file.ends_with("-dark") {
                     let start = std::time::Instant::now();
                     if let Some(dark) = lib
-                        .config
                         .downloaded_assets
                         .get(&format!("{}/{}", package.name, dark_path))
                     {
@@ -468,11 +460,7 @@ pub async fn resolve_foreign_variable2022(
                     {
                         print!("Processing {}/{} ... ", package.name.as_str(), dark_path);
                         fastn_core::utils::write(
-                            &lib.config
-                                .config
-                                .build_dir()
-                                .join("-")
-                                .join(package.name.as_str()),
+                            &lib.config.build_dir().join("-").join(package.name.as_str()),
                             dark_path.as_str(),
                             dark.as_slice(),
                         )
@@ -491,7 +479,7 @@ pub async fn resolve_foreign_variable2022(
                     } else {
                         dark_mode = light_mode.clone();
                     }
-                    lib.config.downloaded_assets.insert(
+                    lib.downloaded_assets.insert(
                         format!("{}/{}", package.name, dark_path),
                         dark_mode.to_string(),
                     );
@@ -556,7 +544,6 @@ async fn download(
 ) -> ftd::ftd2021::p1::Result<()> {
     if download_assets
         && !lib
-            .config
             .downloaded_assets
             .contains_key(&format!("{}/{}", package.name, path))
     {
@@ -571,11 +558,7 @@ async fn download(
             })?;
         print!("Processing {}/{} ... ", package.name, path);
         fastn_core::utils::write(
-            &lib.config
-                .config
-                .build_dir()
-                .join("-")
-                .join(package.name.as_str()),
+            &lib.config.build_dir().join("-").join(package.name.as_str()),
             path,
             data.as_slice(),
         )
@@ -585,7 +568,7 @@ async fn download(
             doc_id: lib.document_id.to_string(),
             line_number: 0,
         })?;
-        lib.config.downloaded_assets.insert(
+        lib.downloaded_assets.insert(
             format!("{}/{}", package.name, path),
             format!("-/{}/{}", package.name, path),
         );
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index b12c74200c..f74f03c514 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -826,7 +826,7 @@ pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
 
 pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_>) -> String {
     let lib = fastn_core::Library {
-        config: lib.config.clone(),
+        config: lib.clone(),
         markdown: lib.markdown.clone(),
         document_id: lib.document_id.clone(),
         translated_data: lib.translated_data.clone(),
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 8521d4b132..a2ae8c1f92 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -13,17 +13,7 @@ impl KeyValueData {
     }
 }
 
-#[derive(Debug)]
-pub struct Library2022<'m> {
-    pub config: &'m mut fastn_core::RequestConfig<'m>,
-    /// If the current module being parsed is a markdown file, `.markdown` contains the name and
-    /// content of that file
-    pub markdown: Option<(String, String)>,
-    pub document_id: String,
-    pub translated_data: fastn_core::TranslationData,
-    pub base_url: String,
-    pub module_package_map: std::collections::BTreeMap<String, String>,
-}
+pub type Library2022<'m> = fastn_core::RequestConfig<'m>;
 
 impl Library2022<'_> {
     pub async fn get_with_result(
@@ -52,7 +42,6 @@ impl Library2022<'_> {
             })?;
 
         self.config
-            .config
             .all_packages
             .borrow()
             .get(current_package_name)
@@ -153,7 +142,7 @@ impl Library2022<'_> {
             lib: &mut fastn_core::Library2022<'_>,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
-            let packages = lib.config.config.all_packages.borrow();
+            let packages = lib.config.all_packages.borrow();
             let package = packages.get(package.name.as_str()).unwrap_or(package);
             // Explicit check for the current package.
             let name = format!("{}/", name.trim_end_matches('/'));
@@ -162,11 +151,7 @@ impl Library2022<'_> {
             }
             let new_name = name.replacen(package.name.as_str(), "", 1);
             let (file_path, data) = package
-                .resolve_by_id(
-                    new_name.as_str(),
-                    None,
-                    lib.config.config.package.name.as_str(),
-                )
+                .resolve_by_id(new_name.as_str(), None, lib.config.package.name.as_str())
                 .await
                 .ok()?;
             if !file_path.ends_with(".ftd") {
@@ -191,7 +176,6 @@ impl Library2022<'_> {
             package.name.to_string(),
         );
         if self
-            .config
             .config
             .all_packages
             .borrow()
@@ -200,19 +184,15 @@ impl Library2022<'_> {
             return Ok(());
         }
 
-        let package = self
-            .config
-            .config
-            .resolve_package(package)
-            .await
-            .map_err(|_| ftd::ftd2021::p1::Error::ParseError {
+        let package = self.config.resolve_package(package).await.map_err(|_| {
+            ftd::ftd2021::p1::Error::ParseError {
                 message: format!("Cannot resolve the package: {}", package.name),
                 doc_id: self.document_id.to_string(),
                 line_number: 0,
-            })?;
+            }
+        })?;
 
         self.config
-            .config
             .all_packages
             .borrow_mut()
             .insert(package.name.to_string(), package);
@@ -243,69 +223,52 @@ impl Library2022<'_> {
             "figma-cs-token-old" => {
                 processor::figma_tokens::process_figma_tokens_old(value, kind, doc)
             }
-            "http" => processor::http::process(value, kind, doc, self.config).await,
+            "http" => processor::http::process(value, kind, doc, self).await,
             "tutor" => fastn_core::tutor::process(value, kind, doc).await,
             "toc" => processor::toc::process(value, kind, doc),
-            "get-data" => processor::get_data::process(value, kind, doc, self.config),
-            "sitemap" => processor::sitemap::process(value, kind, doc, self.config),
-            "full-sitemap" => {
-                processor::sitemap::full_sitemap_process(value, kind, doc, self.config)
-            }
-            "request-data" => processor::request_data::process(value, kind, doc, self.config),
+            "get-data" => processor::get_data::process(value, kind, doc, self),
+            "sitemap" => processor::sitemap::process(value, kind, doc, self),
+            "full-sitemap" => processor::sitemap::full_sitemap_process(value, kind, doc, self),
+            "request-data" => processor::request_data::process(value, kind, doc, self),
             "document-readers" => processor::document::process_readers(
                 value,
                 kind,
                 doc,
-                self.config,
+                self,
                 self.document_id.as_str(),
             ),
             "document-writers" => processor::document::process_writers(
                 value,
                 kind,
                 doc,
-                self.config,
+                self,
                 self.document_id.as_str(),
             ),
-            "user-groups" => processor::user_group::process(value, kind, doc, self.config),
-            "user-group-by-id" => {
-                processor::user_group::process_by_id(value, kind, doc, self.config)
-            }
-            "get-identities" => {
-                processor::user_group::get_identities(value, kind, doc, self.config)
-            }
-            "document-id" => processor::document::document_id(value, kind, doc, self.config),
-            "document-full-id" => {
-                processor::document::document_full_id(value, kind, doc, self.config)
-            }
-            "document-suffix" => {
-                processor::document::document_suffix(value, kind, doc, self.config)
-            }
-            "document-name" => {
-                processor::document::document_name(value, kind, doc, self.config).await
-            }
-            "fetch-file" => processor::fetch_file::fetch_files(value, kind, doc, self.config).await,
-            "user-details" => processor::user_details::process(value, kind, doc, self.config),
-            "fastn-apps" => processor::apps::process(value, kind, doc, self.config),
-            "is-reader" => processor::user_group::is_reader(value, kind, doc, self.config).await,
-            "sql" => processor::sql::process(value, kind, doc, self.config).await,
+            "user-groups" => processor::user_group::process(value, kind, doc, self),
+            "user-group-by-id" => processor::user_group::process_by_id(value, kind, doc, self),
+            "get-identities" => processor::user_group::get_identities(value, kind, doc, self),
+            "document-id" => processor::document::document_id(value, kind, doc, self),
+            "document-full-id" => processor::document::document_full_id(value, kind, doc, self),
+            "document-suffix" => processor::document::document_suffix(value, kind, doc, self),
+            "document-name" => processor::document::document_name(value, kind, doc, self).await,
+            "fetch-file" => processor::fetch_file::fetch_files(value, kind, doc, self).await,
+            "user-details" => processor::user_details::process(value, kind, doc, self),
+            "fastn-apps" => processor::apps::process(value, kind, doc, self),
+            "is-reader" => processor::user_group::is_reader(value, kind, doc, self).await,
+            "sql" => processor::sql::process(value, kind, doc, self).await,
             "package-query" => {
                 processor::sqlite::process(
                     value,
                     kind,
                     doc,
-                    self.config,
+                    self,
                     &fastn_core::library2022::processor::sql::get_db_config()?,
                 )
                 .await
             }
             "pg" => processor::pg::process(value, kind, doc).await,
-            "package-tree" => {
-                processor::package_tree::process(value, kind, doc, self.config.config).await
-            }
-            "query" => {
-                processor::query::process(value, kind, doc, self.config, self.document_id.as_str())
-                    .await
-            }
+            "package-tree" => processor::package_tree::process(value, kind, doc, self.config).await,
+            "query" => processor::query::process(value, kind, doc, self).await,
             t => Err(ftd::interpreter::Error::ParseError {
                 doc_id: self.document_id.to_string(),
                 line_number,
diff --git a/fastn-core/src/library2022/processor/query.rs b/fastn-core/src/library2022/processor/query.rs
index a1589a5b6f..bec69b00d8 100644
--- a/fastn-core/src/library2022/processor/query.rs
+++ b/fastn-core/src/library2022/processor/query.rs
@@ -3,7 +3,6 @@ pub async fn process(
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
     req_config: &mut fastn_core::RequestConfig<'_>,
-    document_id: &str,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     // TODO: document key should be optional
 
@@ -14,7 +13,7 @@ pub async fn process(
 
     let path = headers
         .get_optional_string_by_key("file", doc.name, value.line_number())?
-        .unwrap_or_else(|| document_id.to_string());
+        .unwrap_or_else(|| req_config.document_id.to_string());
 
     let stage = headers
         .get_optional_string_by_key("stage", doc.name, value.line_number())?
@@ -25,14 +24,14 @@ pub async fn process(
         .await
         .map_err(|e| ftd::interpreter::Error::ParseError {
             message: format!("Cannot get path: {} {:?}", path.as_str(), e),
-            doc_id: document_id.to_string(),
+            doc_id: req_config.document_id.to_string(),
             line_number: value.line_number(),
         })?;
     doc.from_json(
         &fastn_core::commands::query::get_ftd_json(&file, stage.as_str()).map_err(|e| {
             ftd::interpreter::Error::ParseError {
                 message: format!("Cannot resolve json for path: {} {:?}", path.as_str(), e),
-                doc_id: document_id.to_string(),
+                doc_id: req_config.document_id.to_string(),
                 line_number: value.line_number(),
             }
         })?,
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index 60a772ce42..7539527892 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -403,14 +403,8 @@ pub(crate) async fn read_ftd_2022<'o, 'm: 'o>(
         .unwrap_or(&config.config.package)
         .to_owned();
 
-    let mut lib = fastn_core::Library2022 {
-        config,
-        markdown: None,
-        document_id: main.id.clone(),
-        translated_data: Default::default(),
-        base_url: base_url.to_string(),
-        module_package_map: Default::default(),
-    };
+    config.document_id = main.id.clone();
+    config.base_url = base_url.to_string();
 
     // Get Prefix Body => [AutoImports + Actual Doc content]
     let mut doc_content =
@@ -422,7 +416,7 @@ pub(crate) async fn read_ftd_2022<'o, 'm: 'o>(
     let main_ftd_doc = match fastn_core::doc::interpret_helper(
         main.id_with_package().as_str(),
         doc_content.as_str(),
-        &mut lib,
+        config,
         base_url,
         download_assets,
         line_number,
@@ -478,14 +472,8 @@ pub(crate) async fn read_ftd_2023<'o, 'm: 'o>(
         .unwrap_or(&config.config.package)
         .to_owned();
 
-    let mut lib = fastn_core::Library2022 {
-        config,
-        markdown: None,
-        document_id: main.id.clone(),
-        translated_data: Default::default(),
-        base_url: base_url.to_string(),
-        module_package_map: Default::default(),
-    };
+    config.document_id = main.id.clone();
+    config.base_url = base_url.to_string();
 
     // Get Prefix Body => [AutoImports + Actual Doc content]
     let mut doc_content =
@@ -497,7 +485,7 @@ pub(crate) async fn read_ftd_2023<'o, 'm: 'o>(
     let main_ftd_doc = match fastn_core::doc::interpret_helper(
         main.id_with_package().as_str(),
         doc_content.as_str(),
-        &mut lib,
+        config,
         base_url,
         download_assets,
         line_number,

From 69af5984d8a69c8c405f9e30b20f3d771476d4e6 Mon Sep 17 00:00:00 2001
From: Arpita-Jaiswal <ayushipujaa@gmail.com>
Date: Fri, 3 Nov 2023 18:58:25 +0530
Subject: [PATCH 18/32] RequestConfig: remove reference from config and request

---
 fastn-core/src/commands/serve.rs              | 14 +++++-----
 fastn-core/src/config/mod.rs                  | 28 +++++++++----------
 fastn-core/src/doc.rs                         | 16 +++++------
 fastn-core/src/library/fastn_dot_ftd.rs       | 18 ++++++------
 fastn-core/src/library/mod.rs                 | 20 ++++++-------
 fastn-core/src/library2022/mod.rs             | 12 ++++----
 .../src/library2022/processor/document.rs     |  2 +-
 .../src/library2022/processor/fetch_file.rs   |  2 +-
 fastn-core/src/library2022/processor/http.rs  | 10 +++----
 fastn-core/src/library2022/processor/query.rs |  2 +-
 fastn-core/src/library2022/processor/sql.rs   |  2 +-
 .../src/library2022/processor/sqlite.rs       |  2 +-
 .../src/library2022/processor/user_group.rs   |  4 +--
 fastn-core/src/package/app.rs                 |  9 ++----
 fastn-core/src/package/package_doc.rs         | 20 ++++++-------
 fastn-core/src/package/user_group.rs          |  4 +--
 16 files changed, 82 insertions(+), 83 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 8c69eca160..8dc4aeb36a 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,11 +18,11 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file<'o, 'm: 'o>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+async fn serve_file<'m>(
+    config: &'m mut fastn_core::RequestConfig,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
-    if let Some(r) = handle_redirect(config.config, path) {
+    if let Some(r) = handle_redirect(&config.config, path) {
         return r;
     }
 
@@ -123,8 +123,8 @@ async fn serve_file<'o, 'm: 'o>(
     }
 }
 
-async fn serve_cr_file<'o, 'm: 'o>(
-    req_config: &'m mut fastn_core::RequestConfig<'o>,
+async fn serve_cr_file<'m>(
+    req_config: &'m mut fastn_core::RequestConfig,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
@@ -302,7 +302,7 @@ pub async fn serve(
 
         // if request goes with mount-point /todos/api/add-todo/
         // so it should say not found and pass it to proxy
-        let cookies = req_config.request.cookies();
+        let cookies = req_config.request.cookies().clone();
 
         let file_response = serve_file(&mut req_config, path.as_path()).await;
         // If path is not present in sitemap then pass it to proxy
@@ -339,7 +339,7 @@ pub async fn serve(
                         if let Some(user_data) = fastn_core::auth::get_user_data_from_cookies(
                             platform,
                             requested_field,
-                            cookies,
+                            &cookies,
                         )
                         .await?
                         {
diff --git a/fastn-core/src/config/mod.rs b/fastn-core/src/config/mod.rs
index 982bf4d5a2..d674494afe 100644
--- a/fastn-core/src/config/mod.rs
+++ b/fastn-core/src/config/mod.rs
@@ -43,14 +43,14 @@ pub struct Config {
 }
 
 #[derive(Debug, Clone)]
-pub struct RequestConfig<'a> {
+pub struct RequestConfig {
     pub named_parameters: Vec<(String, ftd::Value)>,
     pub extra_data: std::collections::BTreeMap<String, String>,
     pub downloaded_assets: std::collections::BTreeMap<String, String>,
     pub current_document: Option<String>,
     pub dependencies_during_render: Vec<String>,
-    pub request: &'a fastn_core::http::Request,
-    pub config: &'a Config,
+    pub request: fastn_core::http::Request,
+    pub config: Config,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -60,10 +60,10 @@ pub struct RequestConfig<'a> {
     pub module_package_map: std::collections::BTreeMap<String, String>,
 }
 
-impl<'a> RequestConfig<'a> {
+impl RequestConfig {
     pub fn new(
-        config: &'a Config,
-        request: &'a fastn_core::http::Request,
+        config: &Config,
+        request: &fastn_core::http::Request,
         document_id: &str,
         base_url: &str,
     ) -> Self {
@@ -73,8 +73,8 @@ impl<'a> RequestConfig<'a> {
             downloaded_assets: Default::default(),
             current_document: None,
             dependencies_during_render: vec![],
-            request,
-            config,
+            request: request.clone(),
+            config: config.clone(),
             markdown: None,
             document_id: document_id.to_string(),
             translated_data: Default::default(),
@@ -234,15 +234,15 @@ impl<'a> RequestConfig<'a> {
                 return Ok(true);
             }
             let access_identities = fastn_core::user_group::access_identities(
-                self.config,
-                self.request,
+                &self.config,
+                &self.request,
                 &document_name,
                 true,
             )
             .await?;
 
             let belongs_to = fastn_core::user_group::belongs_to(
-                self.config,
+                &self.config,
                 document_readers.as_slice(),
                 access_identities.iter().collect_vec().as_slice(),
             )?;
@@ -267,15 +267,15 @@ impl<'a> RequestConfig<'a> {
             let document_writers =
                 sitemap.writers(document_name.as_str(), &self.config.package.groups);
             let access_identities = fastn_core::user_group::access_identities(
-                self.config,
-                self.request,
+                &self.config,
+                &self.request,
                 &document_name,
                 false,
             )
             .await?;
 
             return fastn_core::user_group::belongs_to(
-                self.config,
+                &self.config,
                 document_writers.as_slice(),
                 access_identities.iter().collect_vec().as_slice(),
             );
diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index 3dd32177f4..56b6a49130 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -29,7 +29,7 @@ fn cached_parse(
 pub async fn interpret_helper<'a>(
     name: &str,
     source: &str,
-    lib: &'a mut fastn_core::Library2022<'_>,
+    lib: &'a mut fastn_core::Library2022,
     base_url: &str,
     download_assets: bool,
     line_number: usize,
@@ -113,7 +113,7 @@ pub async fn interpret_helper<'a>(
 }
 
 pub async fn resolve_import<'a>(
-    lib: &'a mut fastn_core::Library2<'_>,
+    lib: &'a mut fastn_core::Library2,
     state: &mut ftd::ftd2021::InterpreterState,
     module: &str,
 ) -> ftd::ftd2021::p1::Result<String> {
@@ -160,7 +160,7 @@ pub async fn resolve_import<'a>(
 
 // source, foreign_variable, foreign_function
 pub async fn resolve_import_2022<'a>(
-    lib: &'a mut fastn_core::Library2022<'_>,
+    lib: &'a mut fastn_core::Library2022,
     _state: &mut ftd::interpreter::InterpreterState,
     module: &str,
     caller_module: &str,
@@ -292,7 +292,7 @@ pub async fn resolve_import_2022<'a>(
 pub async fn resolve_foreign_variable2022(
     variable: &str,
     doc_name: &str,
-    lib: &mut fastn_core::Library2022<'_>,
+    lib: &mut fastn_core::Library2022,
     base_url: &str,
     download_assets: bool,
     caller_module: &str,
@@ -353,7 +353,7 @@ pub async fn resolve_foreign_variable2022(
         module: &str,
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::RequestConfig<'_>,
+        lib: &mut fastn_core::RequestConfig,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::interpreter::Value> {
@@ -537,7 +537,7 @@ pub async fn resolve_foreign_variable2022(
 }
 
 async fn download(
-    lib: &mut fastn_core::Library2022<'_>,
+    lib: &mut fastn_core::Library2022,
     download_assets: bool,
     package: &fastn_core::Package,
     path: &str,
@@ -585,7 +585,7 @@ pub async fn resolve_foreign_variable2(
     variable: &str,
     doc_name: &str,
     state: &ftd::ftd2021::InterpreterState,
-    lib: &mut fastn_core::Library2<'_>,
+    lib: &mut fastn_core::Library2,
     base_url: &str,
     download_assets: bool,
 ) -> ftd::ftd2021::p1::Result<ftd::Value> {
@@ -620,7 +620,7 @@ pub async fn resolve_foreign_variable2(
     async fn get_assets_value(
         package: &fastn_core::Package,
         files: &str,
-        lib: &mut fastn_core::Library2<'_>,
+        lib: &mut fastn_core::Library2,
         base_url: &str,
         download_assets: bool, // true: in case of `fastn build`
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
diff --git a/fastn-core/src/library/fastn_dot_ftd.rs b/fastn-core/src/library/fastn_dot_ftd.rs
index f74f03c514..1085ec864b 100644
--- a/fastn-core/src/library/fastn_dot_ftd.rs
+++ b/fastn-core/src/library/fastn_dot_ftd.rs
@@ -1,6 +1,6 @@
 use crate::utils::HasElements;
 
-async fn i18n_data(lib: &fastn_core::Library<'_>) -> String {
+async fn i18n_data(lib: &fastn_core::Library) -> String {
     let lang = match lib.config.config.package.language {
         Some(ref lang) => {
             realm_lang::Language::from_2_letter_code(lang).unwrap_or(realm_lang::Language::English)
@@ -19,7 +19,7 @@ async fn i18n_data(lib: &fastn_core::Library<'_>) -> String {
 
     let current_document_last_modified_on =
         fastn_core::utils::get_current_document_last_modified_on(
-            lib.config.config,
+            &lib.config.config,
             lib.document_id.as_str(),
         )
         .await;
@@ -243,7 +243,7 @@ fn construct_fastn_cli_variables(_lib: &fastn_core::Library) -> String {
     )
 }
 
-pub(crate) async fn get2022_(lib: &fastn_core::Library<'_>) -> String {
+pub(crate) async fn get2022_(lib: &fastn_core::Library) -> String {
     #[allow(clippy::format_in_format_args)]
     let mut fastn_base = format!(
         indoc::indoc! {"
@@ -267,7 +267,7 @@ pub(crate) async fn get2022_(lib: &fastn_core::Library<'_>) -> String {
     );
 
     if let Ok(number_of_documents) = futures::executor::block_on(
-        fastn_core::utils::get_number_of_documents(lib.config.config),
+        fastn_core::utils::get_number_of_documents(&lib.config.config),
     ) {
         fastn_base = format!(
             indoc::indoc! {"
@@ -299,7 +299,7 @@ pub(crate) async fn get2022_(lib: &fastn_core::Library<'_>) -> String {
     fastn_base
 }
 
-pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
+pub(crate) async fn get(lib: &fastn_core::Library) -> String {
     #[allow(clippy::format_in_format_args)]
     let mut fastn_base = format!(
         indoc::indoc! {"
@@ -406,7 +406,7 @@ pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
     }
 
     if let Ok(number_of_documents) = futures::executor::block_on(
-        fastn_core::utils::get_number_of_documents(lib.config.config),
+        fastn_core::utils::get_number_of_documents(&lib.config.config),
     ) {
         fastn_base = format!(
             indoc::indoc! {"
@@ -435,7 +435,7 @@ pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
 
     if let Some(last_modified_on) =
         futures::executor::block_on(fastn_core::utils::get_current_document_last_modified_on(
-            lib.config.config,
+            &lib.config.config,
             lib.document_id.as_str(),
         ))
     {
@@ -812,7 +812,7 @@ pub(crate) async fn get(lib: &fastn_core::Library<'_>) -> String {
     fastn_base
 }
 
-pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
+pub(crate) async fn get2(lib: &fastn_core::Library2) -> String {
     let lib = fastn_core::Library {
         config: lib.config.clone(),
         markdown: lib.markdown.clone(),
@@ -824,7 +824,7 @@ pub(crate) async fn get2(lib: &fastn_core::Library2<'_>) -> String {
     get(&lib).await
 }
 
-pub(crate) async fn get2022(lib: &fastn_core::Library2022<'_>) -> String {
+pub(crate) async fn get2022(lib: &fastn_core::Library2022) -> String {
     let lib = fastn_core::Library {
         config: lib.clone(),
         markdown: lib.markdown.clone(),
diff --git a/fastn-core/src/library/mod.rs b/fastn-core/src/library/mod.rs
index 1a997fb24d..2e172386e7 100644
--- a/fastn-core/src/library/mod.rs
+++ b/fastn-core/src/library/mod.rs
@@ -6,8 +6,8 @@ pub(crate) mod toc;
 pub use fastn_core::Library2022;
 
 #[derive(Debug)]
-pub struct Library<'a> {
-    pub config: fastn_core::RequestConfig<'a>,
+pub struct Library {
+    pub config: fastn_core::RequestConfig,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -19,7 +19,7 @@ pub struct Library<'a> {
     pub base_url: String,
 }
 
-impl Library<'_> {
+impl Library {
     pub async fn get_with_result(
         &self,
         name: &str,
@@ -46,7 +46,7 @@ impl Library<'_> {
         async fn get_for_package(
             name: &str,
             packages: &mut Vec<fastn_core::Package>,
-            lib: &fastn_core::Library<'_>,
+            lib: &fastn_core::Library,
         ) -> Option<String> {
             let package = packages.last()?;
             if name.starts_with(package.name.as_str()) {
@@ -120,7 +120,7 @@ impl Library<'_> {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &Library<'_>,
+            lib: &Library,
         ) -> Option<String> {
             let path = lib.config.config.get_root_for_package(package);
             fastn_core::Config::download_required_file(&lib.config.config.root, name, package)
@@ -147,8 +147,8 @@ impl Library<'_> {
 }
 
 #[derive(Debug)]
-pub struct Library2<'a> {
-    pub config: fastn_core::RequestConfig<'a>,
+pub struct Library2 {
+    pub config: fastn_core::RequestConfig,
     /// If the current module being parsed is a markdown file, `.markdown` contains the name and
     /// content of that file
     pub markdown: Option<(String, String)>,
@@ -158,7 +158,7 @@ pub struct Library2<'a> {
     pub packages_under_process: Vec<String>,
 }
 
-impl Library2<'_> {
+impl Library2 {
     pub(crate) async fn push_package_under_process(
         &mut self,
         package: &fastn_core::Package,
@@ -236,7 +236,7 @@ impl Library2<'_> {
 
         return get_for_package(format!("{}/", name.trim_end_matches('/')).as_str(), self).await;
 
-        async fn get_for_package(name: &str, lib: &mut fastn_core::Library2<'_>) -> Option<String> {
+        async fn get_for_package(name: &str, lib: &mut fastn_core::Library2) -> Option<String> {
             let package = lib.get_current_package().ok()?;
             if name.starts_with(package.name.as_str()) {
                 if let Some(r) = get_data_from_package(name, &package, lib).await {
@@ -291,7 +291,7 @@ impl Library2<'_> {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut Library2<'_>,
+            lib: &mut Library2,
         ) -> Option<String> {
             lib.push_package_under_process(package).await.ok()?;
             let packages = lib.config.config.all_packages.borrow();
diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index a2ae8c1f92..162a72abfb 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -13,9 +13,9 @@ impl KeyValueData {
     }
 }
 
-pub type Library2022<'m> = fastn_core::RequestConfig<'m>;
+pub type Library2022 = fastn_core::RequestConfig;
 
-impl Library2022<'_> {
+impl Library2022 {
     pub async fn get_with_result(
         &mut self,
         name: &str,
@@ -75,7 +75,7 @@ impl Library2022<'_> {
 
         async fn get_for_package(
             name: &str,
-            lib: &mut fastn_core::Library2022<'_>,
+            lib: &mut fastn_core::Library2022,
             current_processing_module: &str,
         ) -> Option<(String, String, usize)> {
             let package = lib.get_current_package(current_processing_module).ok()?;
@@ -139,7 +139,7 @@ impl Library2022<'_> {
         async fn get_data_from_package(
             name: &str,
             package: &fastn_core::Package,
-            lib: &mut fastn_core::Library2022<'_>,
+            lib: &mut fastn_core::Library2022,
         ) -> Option<(String, usize)> {
             lib.push_package_under_process(name, package).await.ok()?;
             let packages = lib.config.all_packages.borrow();
@@ -267,7 +267,9 @@ impl Library2022<'_> {
                 .await
             }
             "pg" => processor::pg::process(value, kind, doc).await,
-            "package-tree" => processor::package_tree::process(value, kind, doc, self.config).await,
+            "package-tree" => {
+                processor::package_tree::process(value, kind, doc, &self.config).await
+            }
             "query" => processor::query::process(value, kind, doc, self).await,
             t => Err(ftd::interpreter::Error::ParseError {
                 doc_id: self.document_id.to_string(),
diff --git a/fastn-core/src/library2022/processor/document.rs b/fastn-core/src/library2022/processor/document.rs
index eb59b8d692..6ceb04c8c7 100644
--- a/fastn-core/src/library2022/processor/document.rs
+++ b/fastn-core/src/library2022/processor/document.rs
@@ -136,7 +136,7 @@ pub async fn document_name<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    req_config: &fastn_core::RequestConfig<'_>,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let doc_id = req_config.doc_id().unwrap_or_else(|| {
         doc.name
diff --git a/fastn-core/src/library2022/processor/fetch_file.rs b/fastn-core/src/library2022/processor/fetch_file.rs
index 36075b3840..74d8251104 100644
--- a/fastn-core/src/library2022/processor/fetch_file.rs
+++ b/fastn-core/src/library2022/processor/fetch_file.rs
@@ -2,7 +2,7 @@ pub async fn fetch_files(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &fastn_core::RequestConfig<'_>,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     if !kind.is_string() {
         return ftd::interpreter::utils::e2(
diff --git a/fastn-core/src/library2022/processor/http.rs b/fastn-core/src/library2022/processor/http.rs
index 2acf5c8d8f..5e5c6fb245 100644
--- a/fastn-core/src/library2022/processor/http.rs
+++ b/fastn-core/src/library2022/processor/http.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &fastn_core::RequestConfig<'_>,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, line_number) = if let Ok(val) = value.get_record(doc.name) {
         (val.2.to_owned(), val.5.to_owned())
@@ -58,13 +58,13 @@ pub async fn process(
     };
 
     let (_, mut url, conf) =
-        fastn_core::config::utils::get_clean_url(req_config.config, url.as_str()).map_err(|e| {
-            ftd::interpreter::Error::ParseError {
+        fastn_core::config::utils::get_clean_url(&req_config.config, url.as_str()).map_err(
+            |e| ftd::interpreter::Error::ParseError {
                 message: format!("invalid url: {:?}", e),
                 doc_id: doc.name.to_string(),
                 line_number,
-            }
-        })?;
+            },
+        )?;
 
     let mut body = vec![];
     for header in headers.0 {
diff --git a/fastn-core/src/library2022/processor/query.rs b/fastn-core/src/library2022/processor/query.rs
index bec69b00d8..e4b168b27d 100644
--- a/fastn-core/src/library2022/processor/query.rs
+++ b/fastn-core/src/library2022/processor/query.rs
@@ -2,7 +2,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    req_config: &mut fastn_core::RequestConfig<'_>,
+    req_config: &mut fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     // TODO: document key should be optional
 
diff --git a/fastn-core/src/library2022/processor/sql.rs b/fastn-core/src/library2022/processor/sql.rs
index ddf5f8e0f6..f1a3eca3bd 100644
--- a/fastn-core/src/library2022/processor/sql.rs
+++ b/fastn-core/src/library2022/processor/sql.rs
@@ -23,7 +23,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &fastn_core::RequestConfig<'_>,
+    config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let db_config = fastn_core::library2022::processor::sql::get_db_config()?;
     let db_type = db_config.db_type.as_str();
diff --git a/fastn-core/src/library2022/processor/sqlite.rs b/fastn-core/src/library2022/processor/sqlite.rs
index b9afa018c1..91a7e6e8fe 100644
--- a/fastn-core/src/library2022/processor/sqlite.rs
+++ b/fastn-core/src/library2022/processor/sqlite.rs
@@ -28,7 +28,7 @@ pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'_>,
-    config: &fastn_core::RequestConfig<'_>,
+    config: &fastn_core::RequestConfig,
     db_config: &fastn_core::library2022::processor::sql::DatabaseConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let (headers, query) = get_p1_data("package-data", &value, doc.name)?;
diff --git a/fastn-core/src/library2022/processor/user_group.rs b/fastn-core/src/library2022/processor/user_group.rs
index bafeea8472..9ba9b06d9f 100644
--- a/fastn-core/src/library2022/processor/user_group.rs
+++ b/fastn-core/src/library2022/processor/user_group.rs
@@ -65,7 +65,7 @@ pub fn get_identities(
     let doc_id = fastn_core::library2022::utils::document_full_id(req_config, doc)?;
 
     let identities =
-        fastn_core::user_group::get_identities(req_config.config, doc_id.as_str(), true).map_err(
+        fastn_core::user_group::get_identities(&req_config.config, doc_id.as_str(), true).map_err(
             |e| ftd::ftd2021::p1::Error::ParseError {
                 message: e.to_string(),
                 doc_id,
@@ -97,7 +97,7 @@ pub async fn is_reader<'a>(
     value: ftd::ast::VariableValue,
     _kind: ftd::interpreter::Kind,
     doc: &ftd::interpreter::TDoc<'a>,
-    req_config: &fastn_core::RequestConfig<'_>,
+    req_config: &fastn_core::RequestConfig,
 ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
     let doc_id = fastn_core::library2022::utils::document_full_id(req_config, doc)?;
     let is_reader = req_config.can_read(&doc_id, false).await.map_err(|e| {
diff --git a/fastn-core/src/package/app.rs b/fastn-core/src/package/app.rs
index b0be2cf914..d349f08ae2 100644
--- a/fastn-core/src/package/app.rs
+++ b/fastn-core/src/package/app.rs
@@ -94,10 +94,7 @@ impl AppTemp {
 }
 
 // Takes the path /-/<package-name>/<remaining>/ or /mount-point/<remaining>/
-pub async fn can_read(
-    config: &fastn_core::RequestConfig<'_>,
-    path: &str,
-) -> fastn_core::Result<bool> {
+pub async fn can_read(config: &fastn_core::RequestConfig, path: &str) -> fastn_core::Result<bool> {
     use itertools::Itertools;
     // first get the app
     let readers_groups = if let Some((_, _, _, Some(app))) = config
@@ -129,7 +126,7 @@ pub async fn can_read(
 
     let mut app_identities = vec![];
     for ug in user_groups.iter() {
-        app_identities.extend(ug.get_identities(config.config)?)
+        app_identities.extend(ug.get_identities(&config.config)?)
     }
 
     let auth_identities =
@@ -137,7 +134,7 @@ pub async fn can_read(
             .await?;
 
     return fastn_core::user_group::belongs_to(
-        config.config,
+        &config.config,
         user_groups.as_slice(),
         auth_identities.iter().collect_vec().as_slice(),
     );
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index 7539527892..38d054ccaa 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd<'o, 'm: 'o>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd<'m>(
+    config: &'m mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,15 +385,15 @@ pub(crate) async fn read_ftd<'o, 'm: 'o>(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022<'o, 'm: 'o>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd_2022<'m>(
+    config: &'m mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
     test: bool,
 ) -> fastn_core::Result<FTDResult> {
     let font_style = config.config.get_font_style();
-    let c = config.config;
+    let c = &config.config.clone();
 
     let current_package = config
         .config
@@ -454,15 +454,15 @@ pub(crate) async fn read_ftd_2022<'o, 'm: 'o>(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023<'o, 'm: 'o>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn read_ftd_2023<'m>(
+    config: &'m mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
 ) -> fastn_core::Result<FTDResult> {
     let package_name = config.config.package.name.to_string();
     let font_style = config.config.get_font_style();
-    let c = config.config;
+    let c = &config.config.clone();
 
     let current_package = config
         .config
@@ -529,8 +529,8 @@ pub(crate) async fn read_ftd_2023<'o, 'm: 'o>(
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd<'o, 'm: 'o>(
-    config: &'m mut fastn_core::RequestConfig<'o>,
+pub(crate) async fn process_ftd<'m>(
+    config: &'m mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
diff --git a/fastn-core/src/package/user_group.rs b/fastn-core/src/package/user_group.rs
index 8de4829a67..6824c4b5f5 100644
--- a/fastn-core/src/package/user_group.rs
+++ b/fastn-core/src/package/user_group.rs
@@ -607,7 +607,7 @@ pub mod processor {
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
         let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
         let identities =
-            super::get_identities(req_config.config, doc_id.as_str(), true).map_err(|e| {
+            super::get_identities(&req_config.config, doc_id.as_str(), true).map_err(|e| {
                 ftd::ftd2021::p1::Error::ParseError {
                     message: e.to_string(),
                     doc_id,
@@ -642,7 +642,7 @@ pub mod processor {
     pub async fn is_reader<'a>(
         section: &ftd::ftd2021::p1::Section,
         doc: &'a ftd::ftd2021::p2::TDoc<'_>,
-        req_config: &fastn_core::RequestConfig<'_>,
+        req_config: &fastn_core::RequestConfig,
     ) -> ftd::ftd2021::p1::Result<ftd::Value> {
         let doc_id = fastn_core::library::document::document_full_id(req_config, doc)?;
         let is_reader = req_config.can_read(&doc_id, false).await.map_err(|e| {

From 14f53c2427e59dc48799518e4ce779e9a1f09de6 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Fri, 3 Nov 2023 19:24:16 +0530
Subject: [PATCH 19/32] implementing Default

---
 fastn-core/src/http.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/fastn-core/src/http.rs b/fastn-core/src/http.rs
index 5364bfeb79..40af4beb04 100644
--- a/fastn-core/src/http.rs
+++ b/fastn-core/src/http.rs
@@ -73,7 +73,7 @@ pub fn ok_with_content_type(
         .body(data)
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct Request {
     method: String,
     uri: String,
@@ -90,12 +90,6 @@ pub struct Request {
     // path_params: Vec<(String, )>
 }
 
-impl Default for Request {
-    fn default() -> Self {
-        todo!()
-    }
-}
-
 impl Request {
     //pub fn get_named_params() -> {}
     pub fn from_actix(req: actix_web::HttpRequest, body: actix_web::web::Bytes) -> Self {

From 53050006277cc223080b7686504fc3cc71f215db Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Fri, 3 Nov 2023 19:47:37 +0530
Subject: [PATCH 20/32] removed extra print so fbt test passes

---
 fastn-core/src/library2022/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index 162a72abfb..fdcc74a302 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -207,7 +207,6 @@ impl Library2022 {
         processor: String,
         doc: &'a mut ftd::interpreter::TDoc<'a>,
     ) -> ftd::interpreter::Result<ftd::interpreter::Value> {
-        println!("process: {}", &processor);
         tracing::info!(
             msg = "stuck-on-processor",
             doc = doc.name,

From 38d07fece325dfab3f2cffdec6075852c01ceab4 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sat, 4 Nov 2023 11:43:01 +0530
Subject: [PATCH 21/32] test fixes and removed some un-needed lifetimes

---
 fastn-core/src/commands/serve.rs      |  8 ++++----
 fastn-core/src/package/package_doc.rs | 16 ++++++++--------
 ftd/ftd-js.html                       |  3 +--
 ftd/src/ftd2021/p1/parser.rs          |  4 +++-
 ftd/src/js/ftd_test_helpers.rs        |  1 +
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 8dc4aeb36a..be55481be9 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -18,8 +18,8 @@ fn handle_redirect(
 /// path: /<file-name>/
 ///
 #[tracing::instrument(skip_all)]
-async fn serve_file<'m>(
-    config: &'m mut fastn_core::RequestConfig,
+async fn serve_file(
+    config: &mut fastn_core::RequestConfig,
     path: &camino::Utf8Path,
 ) -> fastn_core::http::Response {
     if let Some(r) = handle_redirect(&config.config, path) {
@@ -123,8 +123,8 @@ async fn serve_file<'m>(
     }
 }
 
-async fn serve_cr_file<'m>(
-    req_config: &'m mut fastn_core::RequestConfig,
+async fn serve_cr_file(
+    req_config: &mut fastn_core::RequestConfig,
     path: &camino::Utf8Path,
     cr_number: usize,
 ) -> fastn_core::http::Response {
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index 38d054ccaa..89996d6319 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -363,8 +363,8 @@ impl From<FTDResult> for fastn_core::http::Response {
 }
 
 #[tracing::instrument(skip_all)]
-pub(crate) async fn read_ftd<'m>(
-    config: &'m mut fastn_core::RequestConfig,
+pub(crate) async fn read_ftd(
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -385,8 +385,8 @@ pub(crate) async fn read_ftd<'m>(
 }
 
 #[tracing::instrument(name = "read_ftd_2022", skip_all)]
-pub(crate) async fn read_ftd_2022<'m>(
-    config: &'m mut fastn_core::RequestConfig,
+pub(crate) async fn read_ftd_2022(
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -454,8 +454,8 @@ pub(crate) async fn read_ftd_2022<'m>(
 
 #[allow(clippy::await_holding_refcell_ref)]
 #[tracing::instrument(name = "read_ftd_2023", skip_all)]
-pub(crate) async fn read_ftd_2023<'m>(
-    config: &'m mut fastn_core::RequestConfig,
+pub(crate) async fn read_ftd_2023(
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     download_assets: bool,
@@ -529,8 +529,8 @@ pub(crate) async fn read_ftd_2023<'m>(
     Ok(FTDResult::Html(file_content.into()))
 }
 
-pub(crate) async fn process_ftd<'m>(
-    config: &'m mut fastn_core::RequestConfig,
+pub(crate) async fn process_ftd(
+    config: &mut fastn_core::RequestConfig,
     main: &fastn_core::Document,
     base_url: &str,
     build_static_files: bool,
diff --git a/ftd/ftd-js.html b/ftd/ftd-js.html
index 62934ad4c0..d9cad7d961 100644
--- a/ftd/ftd-js.html
+++ b/ftd/ftd-js.html
@@ -10,8 +10,7 @@
         __fastn_package__
     </script>
 
-    __script_file__
-    __extra_js__
+    __script_file____extra_js__
 
     <style>
        __default_css__
diff --git a/ftd/src/ftd2021/p1/parser.rs b/ftd/src/ftd2021/p1/parser.rs
index 258d60930e..056399fb3f 100644
--- a/ftd/src/ftd2021/p1/parser.rs
+++ b/ftd/src/ftd2021/p1/parser.rs
@@ -815,13 +815,15 @@ mod test {
             ),
             super::Section::with_name("hello")
                 .add_sub_section(super::SubSection::with_name("realm.rr.step.body").and_body(
-                    r#"
+                    &indoc!(
+                        r#"
                         {
                           "body": "-- h0: Hello World\n\n-- markup:\n\ndemo cr 1\n",
                           "kind": "content",
                           "track": "amitu/index",
                           "version": "2020-11-16T04:13:14.642892+00:00"
                         }"#
+                    )
                 ))
                 .list()
         );
diff --git a/ftd/src/js/ftd_test_helpers.rs b/ftd/src/js/ftd_test_helpers.rs
index fbfe1c8b1b..8e0c4c4119 100644
--- a/ftd/src/js/ftd_test_helpers.rs
+++ b/ftd/src/js/ftd_test_helpers.rs
@@ -129,6 +129,7 @@ fn p(s: &str, t: &str, fix: bool, manual: bool, script: bool, file_location: &st
             );
 
             ftd::ftd_js_html()
+                .replace("__extra_js__", "")
                 .replace("__fastn_package__", dummy_package_data.as_str())
                 .replace(
                     "__js_script__",

From bd79f478f8de92789a37ea673b3322ddea044fa2 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sat, 4 Nov 2023 13:17:41 +0530
Subject: [PATCH 22/32] doctype html in test files

---
 ftd/t/js/01-basic-module.html                   | 1 +
 ftd/t/js/01-basic.html                          | 1 +
 ftd/t/js/02-property.html                       | 1 +
 ftd/t/js/03-common-properties.html              | 1 +
 ftd/t/js/04-variable.html                       | 1 +
 ftd/t/js/05-dynamic-dom-list.html               | 1 +
 ftd/t/js/06-dynamic-dom-list-2.html             | 1 +
 ftd/t/js/07-dynamic-dom-record-list.html        | 1 +
 ftd/t/js/08-inherited.html                      | 1 +
 ftd/t/js/09-text-properties.html                | 1 +
 ftd/t/js/10-color-test.html                     | 1 +
 ftd/t/js/11-device.html                         | 1 +
 ftd/t/js/12-children.html                       | 1 +
 ftd/t/js/13-non-style-properties.html           | 1 +
 ftd/t/js/14-code.html                           | 1 +
 ftd/t/js/15-function-call-in-property.html      | 1 +
 ftd/t/js/16-container.html                      | 1 +
 ftd/t/js/17-clone.html                          | 1 +
 ftd/t/js/17-events.html                         | 1 +
 ftd/t/js/18-rive.html                           | 1 +
 ftd/t/js/19-image.html                          | 1 +
 ftd/t/js/20-background-properties.html          | 1 +
 ftd/t/js/21-markdown.html                       | 1 +
 ftd/t/js/22-document.html                       | 1 +
 ftd/t/js/23-record-list.html                    | 1 +
 ftd/t/js/24-device.html                         | 1 +
 ftd/t/js/24-re-export.html                      | 1 +
 ftd/t/js/25-re-re-export.html                   | 1 +
 ftd/t/js/26-re-export.html                      | 1 +
 ftd/t/js/27-for-loop.html                       | 1 +
 ftd/t/js/28-mutable-component-arguments.html    | 1 +
 ftd/t/js/28-web-component.html                  | 1 +
 ftd/t/js/29-dom-list.html                       | 1 +
 ftd/t/js/30-web-component.html                  | 1 +
 ftd/t/js/31-advance-list.html                   | 1 +
 ftd/t/js/31-ftd-len.html                        | 1 +
 ftd/t/js/32-ftd-len.html                        | 1 +
 ftd/t/js/33-list-indexing.html                  | 1 +
 ftd/t/js/34-ftd-ui.html                         | 1 +
 ftd/t/js/36-single-ui.html                      | 1 +
 ftd/t/js/37-expander.html                       | 1 +
 ftd/t/js/38-background-image-properties.html    | 1 +
 ftd/t/js/40-code-themes.html                    | 1 +
 ftd/t/js/41-document-favicon.html               | 1 +
 ftd/t/js/42-links.html                          | 1 +
 ftd/t/js/43-image-object-fit.html               | 1 +
 ftd/t/js/44-local-storage.html                  | 1 +
 ftd/t/js/44-module.html                         | 1 +
 ftd/t/js/45-re-module.html                      | 1 +
 ftd/t/js/45-re-re-module.html                   | 1 +
 ftd/t/js/46-code-languages.html                 | 1 +
 ftd/t/js/47-ftd-code-syntax.html                | 1 +
 ftd/t/js/48-video.html                          | 1 +
 ftd/t/js/49-align-content.html                  | 1 +
 ftd/t/js/50-iframe-fullscreen.html              | 1 +
 ftd/t/js/51-markdown-table.html                 | 1 +
 ftd/t/js/52-events.html                         | 1 +
 ftd/t/js/53-link-color.html                     | 1 +
 ftd/t/js/54-class-fix.html                      | 1 +
 ftd/t/js/56-title-fix.html                      | 1 +
 ftd/t/js/57-code-dark-mode.html                 | 1 +
 ftd/t/js/59-text-shadow.html                    | 1 +
 ftd/t/js/60-conditional-module-headers.html     | 1 +
 ftd/t/js/61-functions.html                      | 1 +
 ftd/t/js/62-fallback-fonts.html                 | 1 +
 ftd/t/js/63-external-js.html                    | 1 +
 ftd/t/js/64-selectable.html                     | 1 +
 ftd/t/js/65-legacy.html                         | 1 +
 ftd/t/js/66-backdrop-filter.html                | 1 +
 ftd/t/js/67-counter.html                        | 1 +
 ftd/t/js/68-mask.html                           | 1 +
 ftd/t/js/69-chained-dot-value-in-functions.html | 1 +
 ftd/t/js/loop.html                              | 1 +
 73 files changed, 73 insertions(+)

diff --git a/ftd/t/js/01-basic-module.html b/ftd/t/js/01-basic-module.html
index fc0a0ecfe8..24e0e01450 100644
--- a/ftd/t/js/01-basic-module.html
+++ b/ftd/t/js/01-basic-module.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/01-basic.html b/ftd/t/js/01-basic.html
index 2053070ff6..003b446fb6 100644
--- a/ftd/t/js/01-basic.html
+++ b/ftd/t/js/01-basic.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/02-property.html b/ftd/t/js/02-property.html
index d2e3407cb8..c36f033866 100644
--- a/ftd/t/js/02-property.html
+++ b/ftd/t/js/02-property.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/03-common-properties.html b/ftd/t/js/03-common-properties.html
index e9b257cd20..72ad4accb6 100644
--- a/ftd/t/js/03-common-properties.html
+++ b/ftd/t/js/03-common-properties.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/04-variable.html b/ftd/t/js/04-variable.html
index 7173cf3317..155ea3e52c 100644
--- a/ftd/t/js/04-variable.html
+++ b/ftd/t/js/04-variable.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/05-dynamic-dom-list.html b/ftd/t/js/05-dynamic-dom-list.html
index fafba33a15..adcd3460ad 100644
--- a/ftd/t/js/05-dynamic-dom-list.html
+++ b/ftd/t/js/05-dynamic-dom-list.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/06-dynamic-dom-list-2.html b/ftd/t/js/06-dynamic-dom-list-2.html
index 9903b08369..dbf14826e5 100644
--- a/ftd/t/js/06-dynamic-dom-list-2.html
+++ b/ftd/t/js/06-dynamic-dom-list-2.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/07-dynamic-dom-record-list.html b/ftd/t/js/07-dynamic-dom-record-list.html
index 9cb1aa489a..8630486b8d 100644
--- a/ftd/t/js/07-dynamic-dom-record-list.html
+++ b/ftd/t/js/07-dynamic-dom-record-list.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/08-inherited.html b/ftd/t/js/08-inherited.html
index 11e09d6cb9..c10138f0d4 100644
--- a/ftd/t/js/08-inherited.html
+++ b/ftd/t/js/08-inherited.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/09-text-properties.html b/ftd/t/js/09-text-properties.html
index 8ab1bc0fae..16c7d844e9 100644
--- a/ftd/t/js/09-text-properties.html
+++ b/ftd/t/js/09-text-properties.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/10-color-test.html b/ftd/t/js/10-color-test.html
index 9b8d973015..ccc8cecc99 100644
--- a/ftd/t/js/10-color-test.html
+++ b/ftd/t/js/10-color-test.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/11-device.html b/ftd/t/js/11-device.html
index 7e71ef5b61..d4276cd45a 100644
--- a/ftd/t/js/11-device.html
+++ b/ftd/t/js/11-device.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/12-children.html b/ftd/t/js/12-children.html
index cc47076b17..be9a03ac8f 100644
--- a/ftd/t/js/12-children.html
+++ b/ftd/t/js/12-children.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/13-non-style-properties.html b/ftd/t/js/13-non-style-properties.html
index 6d7d2640e1..860a80950f 100644
--- a/ftd/t/js/13-non-style-properties.html
+++ b/ftd/t/js/13-non-style-properties.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/14-code.html b/ftd/t/js/14-code.html
index 828862a5d0..f70155a508 100644
--- a/ftd/t/js/14-code.html
+++ b/ftd/t/js/14-code.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/15-function-call-in-property.html b/ftd/t/js/15-function-call-in-property.html
index b122a4d067..d0cd3d7244 100644
--- a/ftd/t/js/15-function-call-in-property.html
+++ b/ftd/t/js/15-function-call-in-property.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/16-container.html b/ftd/t/js/16-container.html
index ec649e1e21..41e5171343 100644
--- a/ftd/t/js/16-container.html
+++ b/ftd/t/js/16-container.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/17-clone.html b/ftd/t/js/17-clone.html
index 69a18fdbee..5dc101f52f 100644
--- a/ftd/t/js/17-clone.html
+++ b/ftd/t/js/17-clone.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/17-events.html b/ftd/t/js/17-events.html
index 91ccc036d5..eebe2ca712 100644
--- a/ftd/t/js/17-events.html
+++ b/ftd/t/js/17-events.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/18-rive.html b/ftd/t/js/18-rive.html
index 368cadd411..fd86f6142d 100644
--- a/ftd/t/js/18-rive.html
+++ b/ftd/t/js/18-rive.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/19-image.html b/ftd/t/js/19-image.html
index 54a956281d..c405c465f6 100644
--- a/ftd/t/js/19-image.html
+++ b/ftd/t/js/19-image.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/20-background-properties.html b/ftd/t/js/20-background-properties.html
index 2164158865..776859504a 100644
--- a/ftd/t/js/20-background-properties.html
+++ b/ftd/t/js/20-background-properties.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/21-markdown.html b/ftd/t/js/21-markdown.html
index 4699f6099a..e31fa7c3ad 100644
--- a/ftd/t/js/21-markdown.html
+++ b/ftd/t/js/21-markdown.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/22-document.html b/ftd/t/js/22-document.html
index 1d063bd199..b64f427435 100644
--- a/ftd/t/js/22-document.html
+++ b/ftd/t/js/22-document.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/23-record-list.html b/ftd/t/js/23-record-list.html
index 731bd58b6c..2c87bb6e04 100644
--- a/ftd/t/js/23-record-list.html
+++ b/ftd/t/js/23-record-list.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/24-device.html b/ftd/t/js/24-device.html
index 665af4f5d7..3489f4f9c9 100644
--- a/ftd/t/js/24-device.html
+++ b/ftd/t/js/24-device.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/24-re-export.html b/ftd/t/js/24-re-export.html
index 26d622c2e4..79ad4c3adb 100644
--- a/ftd/t/js/24-re-export.html
+++ b/ftd/t/js/24-re-export.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/25-re-re-export.html b/ftd/t/js/25-re-re-export.html
index ca2c9898f8..29a3fadbb7 100644
--- a/ftd/t/js/25-re-re-export.html
+++ b/ftd/t/js/25-re-re-export.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/26-re-export.html b/ftd/t/js/26-re-export.html
index 07ef3eecb8..f2c4e6a1b1 100644
--- a/ftd/t/js/26-re-export.html
+++ b/ftd/t/js/26-re-export.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/27-for-loop.html b/ftd/t/js/27-for-loop.html
index e39f5e8740..3b118d0a59 100644
--- a/ftd/t/js/27-for-loop.html
+++ b/ftd/t/js/27-for-loop.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/28-mutable-component-arguments.html b/ftd/t/js/28-mutable-component-arguments.html
index 0b37dfeb34..4a0c413094 100644
--- a/ftd/t/js/28-mutable-component-arguments.html
+++ b/ftd/t/js/28-mutable-component-arguments.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/28-web-component.html b/ftd/t/js/28-web-component.html
index 51bd4c0582..1d9a9dea8a 100644
--- a/ftd/t/js/28-web-component.html
+++ b/ftd/t/js/28-web-component.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/29-dom-list.html b/ftd/t/js/29-dom-list.html
index 404f405050..417e1033c4 100644
--- a/ftd/t/js/29-dom-list.html
+++ b/ftd/t/js/29-dom-list.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/30-web-component.html b/ftd/t/js/30-web-component.html
index 0aaa11417a..848c585116 100644
--- a/ftd/t/js/30-web-component.html
+++ b/ftd/t/js/30-web-component.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/31-advance-list.html b/ftd/t/js/31-advance-list.html
index 16fa8a21f2..c5f4e4f972 100644
--- a/ftd/t/js/31-advance-list.html
+++ b/ftd/t/js/31-advance-list.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/31-ftd-len.html b/ftd/t/js/31-ftd-len.html
index 138062e2c5..4d2e532852 100644
--- a/ftd/t/js/31-ftd-len.html
+++ b/ftd/t/js/31-ftd-len.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/32-ftd-len.html b/ftd/t/js/32-ftd-len.html
index 0c377f2531..3cc4ec2af5 100644
--- a/ftd/t/js/32-ftd-len.html
+++ b/ftd/t/js/32-ftd-len.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/33-list-indexing.html b/ftd/t/js/33-list-indexing.html
index dcfb5c7cac..2718f39a3b 100644
--- a/ftd/t/js/33-list-indexing.html
+++ b/ftd/t/js/33-list-indexing.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/34-ftd-ui.html b/ftd/t/js/34-ftd-ui.html
index 4f4fe27d34..82e70de293 100644
--- a/ftd/t/js/34-ftd-ui.html
+++ b/ftd/t/js/34-ftd-ui.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/36-single-ui.html b/ftd/t/js/36-single-ui.html
index ec1ea6a6bf..534a0e9849 100644
--- a/ftd/t/js/36-single-ui.html
+++ b/ftd/t/js/36-single-ui.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/37-expander.html b/ftd/t/js/37-expander.html
index 67b4e371b0..52b120bc48 100644
--- a/ftd/t/js/37-expander.html
+++ b/ftd/t/js/37-expander.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/38-background-image-properties.html b/ftd/t/js/38-background-image-properties.html
index 72cd66cd35..099dec159d 100644
--- a/ftd/t/js/38-background-image-properties.html
+++ b/ftd/t/js/38-background-image-properties.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/40-code-themes.html b/ftd/t/js/40-code-themes.html
index 815c6c8a3f..c88d1d4117 100644
--- a/ftd/t/js/40-code-themes.html
+++ b/ftd/t/js/40-code-themes.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/41-document-favicon.html b/ftd/t/js/41-document-favicon.html
index aca8eaab1b..60ef9936a7 100644
--- a/ftd/t/js/41-document-favicon.html
+++ b/ftd/t/js/41-document-favicon.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/42-links.html b/ftd/t/js/42-links.html
index d14885e336..fabf6a47ab 100644
--- a/ftd/t/js/42-links.html
+++ b/ftd/t/js/42-links.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/43-image-object-fit.html b/ftd/t/js/43-image-object-fit.html
index 7e84848e09..792a7f9d3b 100644
--- a/ftd/t/js/43-image-object-fit.html
+++ b/ftd/t/js/43-image-object-fit.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/44-local-storage.html b/ftd/t/js/44-local-storage.html
index 5faa06089f..7ee99d8d27 100644
--- a/ftd/t/js/44-local-storage.html
+++ b/ftd/t/js/44-local-storage.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/44-module.html b/ftd/t/js/44-module.html
index a2743a18ec..77f902a972 100644
--- a/ftd/t/js/44-module.html
+++ b/ftd/t/js/44-module.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/45-re-module.html b/ftd/t/js/45-re-module.html
index 911159a75e..6bfeaf264a 100644
--- a/ftd/t/js/45-re-module.html
+++ b/ftd/t/js/45-re-module.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/45-re-re-module.html b/ftd/t/js/45-re-re-module.html
index 59a6a4aa56..0c5d306aa4 100644
--- a/ftd/t/js/45-re-re-module.html
+++ b/ftd/t/js/45-re-re-module.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/46-code-languages.html b/ftd/t/js/46-code-languages.html
index a58532063d..8e0540c626 100644
--- a/ftd/t/js/46-code-languages.html
+++ b/ftd/t/js/46-code-languages.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/47-ftd-code-syntax.html b/ftd/t/js/47-ftd-code-syntax.html
index a988b16f82..736ff5a620 100644
--- a/ftd/t/js/47-ftd-code-syntax.html
+++ b/ftd/t/js/47-ftd-code-syntax.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/48-video.html b/ftd/t/js/48-video.html
index f369a18ba1..658d97b277 100644
--- a/ftd/t/js/48-video.html
+++ b/ftd/t/js/48-video.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/49-align-content.html b/ftd/t/js/49-align-content.html
index c68bb2118f..be2ee5a441 100644
--- a/ftd/t/js/49-align-content.html
+++ b/ftd/t/js/49-align-content.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/50-iframe-fullscreen.html b/ftd/t/js/50-iframe-fullscreen.html
index 548e976c36..41dfa9bbb6 100644
--- a/ftd/t/js/50-iframe-fullscreen.html
+++ b/ftd/t/js/50-iframe-fullscreen.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/51-markdown-table.html b/ftd/t/js/51-markdown-table.html
index c94c24adba..199e3833d7 100644
--- a/ftd/t/js/51-markdown-table.html
+++ b/ftd/t/js/51-markdown-table.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/52-events.html b/ftd/t/js/52-events.html
index 8983db0826..5e10cc36b3 100644
--- a/ftd/t/js/52-events.html
+++ b/ftd/t/js/52-events.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/53-link-color.html b/ftd/t/js/53-link-color.html
index ae875faa86..c2d68c587b 100644
--- a/ftd/t/js/53-link-color.html
+++ b/ftd/t/js/53-link-color.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/54-class-fix.html b/ftd/t/js/54-class-fix.html
index 04b80f70da..f63a67cdf9 100644
--- a/ftd/t/js/54-class-fix.html
+++ b/ftd/t/js/54-class-fix.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/56-title-fix.html b/ftd/t/js/56-title-fix.html
index 93eb211fa7..9762741fe0 100644
--- a/ftd/t/js/56-title-fix.html
+++ b/ftd/t/js/56-title-fix.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/57-code-dark-mode.html b/ftd/t/js/57-code-dark-mode.html
index c8d3329344..2269cd535f 100644
--- a/ftd/t/js/57-code-dark-mode.html
+++ b/ftd/t/js/57-code-dark-mode.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/59-text-shadow.html b/ftd/t/js/59-text-shadow.html
index 1c145f4b56..23cc119eff 100644
--- a/ftd/t/js/59-text-shadow.html
+++ b/ftd/t/js/59-text-shadow.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/60-conditional-module-headers.html b/ftd/t/js/60-conditional-module-headers.html
index b764cf16a4..494ee2d7c5 100644
--- a/ftd/t/js/60-conditional-module-headers.html
+++ b/ftd/t/js/60-conditional-module-headers.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/61-functions.html b/ftd/t/js/61-functions.html
index 92fd34d3c3..5ad1b43532 100644
--- a/ftd/t/js/61-functions.html
+++ b/ftd/t/js/61-functions.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/62-fallback-fonts.html b/ftd/t/js/62-fallback-fonts.html
index b6194da9fe..7b63caa087 100644
--- a/ftd/t/js/62-fallback-fonts.html
+++ b/ftd/t/js/62-fallback-fonts.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/63-external-js.html b/ftd/t/js/63-external-js.html
index 4596553fb7..fc3d9e4942 100644
--- a/ftd/t/js/63-external-js.html
+++ b/ftd/t/js/63-external-js.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/64-selectable.html b/ftd/t/js/64-selectable.html
index 3d58f28f96..360544a2d4 100644
--- a/ftd/t/js/64-selectable.html
+++ b/ftd/t/js/64-selectable.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/65-legacy.html b/ftd/t/js/65-legacy.html
index 49e0b7e3a1..a95b895d8a 100644
--- a/ftd/t/js/65-legacy.html
+++ b/ftd/t/js/65-legacy.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/66-backdrop-filter.html b/ftd/t/js/66-backdrop-filter.html
index 158e8b5f00..a3c902b5cf 100644
--- a/ftd/t/js/66-backdrop-filter.html
+++ b/ftd/t/js/66-backdrop-filter.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/67-counter.html b/ftd/t/js/67-counter.html
index 63f4bb0dae..43c01a8c6b 100644
--- a/ftd/t/js/67-counter.html
+++ b/ftd/t/js/67-counter.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/68-mask.html b/ftd/t/js/68-mask.html
index 32fb620c9c..ffb9eca430 100644
--- a/ftd/t/js/68-mask.html
+++ b/ftd/t/js/68-mask.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/69-chained-dot-value-in-functions.html b/ftd/t/js/69-chained-dot-value-in-functions.html
index bd5811e428..8bacdcdcf2 100644
--- a/ftd/t/js/69-chained-dot-value-in-functions.html
+++ b/ftd/t/js/69-chained-dot-value-in-functions.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
diff --git a/ftd/t/js/loop.html b/ftd/t/js/loop.html
index 639d2e112e..19a5223f2f 100644
--- a/ftd/t/js/loop.html
+++ b/ftd/t/js/loop.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">

From f1e33ce90a22ca38b912e8500b8b4f79785738a7 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sat, 4 Nov 2023 15:14:42 +0530
Subject: [PATCH 23/32] some more test fixes

---
 ftd/src/p1/test.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ftd/src/p1/test.rs b/ftd/src/p1/test.rs
index d5382edcc3..1089d74872 100644
--- a/ftd/src/p1/test.rs
+++ b/ftd/src/p1/test.rs
@@ -454,15 +454,17 @@ fn with_dash_dash() {
         "#
         ),
         &ftd::p1::Section::with_name("hello")
-            .add_sub_section(ftd::p1::Section::with_name("realm.rr.step.body").and_body(
-                r#"
+            .add_sub_section(
+                ftd::p1::Section::with_name("realm.rr.step.body").and_body(&indoc!(
+                    r#"
                         {
                           "body": "-- h0: Hello World\n\n-- markup:\n\ndemo cr 1\n",
                           "kind": "content",
                           "track": "amitu/index",
                           "version": "2020-11-16T04:13:14.642892+00:00"
                         }"#,
-            ))
+                )),
+            )
             .list(),
     );
 }
@@ -470,7 +472,8 @@ fn with_dash_dash() {
 #[test]
 fn indented_body() {
     p(
-        "
+        &indoc!(
+            "
                  -- markup:
 
                  hello world is
@@ -478,7 +481,8 @@ fn indented_body() {
                      not enough
 
                      lol
-            ",
+            "
+        ),
         &ftd::p1::Section::with_name("markup")
             .and_body("hello world is\n\n    not enough\n\n    lol")
             .list(),

From c4f4b807f78f1efa94e0c57b710a6cc813eb11e3 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sat, 4 Nov 2023 15:50:56 +0530
Subject: [PATCH 24/32] elided some more lifetimes

---
 fastn-core/src/doc.rs                 | 12 ++++++------
 ftd/src/executor/main.rs              |  2 +-
 ftd/src/executor/tdoc.rs              |  2 +-
 ftd/src/ftd2021/execute_doc.rs        |  2 +-
 ftd/src/ftd2021/interpreter/tdoc.rs   |  2 +-
 ftd/src/ftd2021/p2/tdoc.rs            | 16 ++++++++--------
 ftd/src/html/data.rs                  |  4 ++--
 ftd/src/html/dependencies.rs          |  4 ++--
 ftd/src/html/dummy_html.rs            |  8 ++++----
 ftd/src/html/events.rs                |  2 +-
 ftd/src/html/main.rs                  |  4 ++--
 ftd/src/html/variable_dependencies.rs |  4 ++--
 ftd/src/interpreter/main.rs           |  2 +-
 ftd/src/interpreter/utils.rs          | 10 +++++-----
 14 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/fastn-core/src/doc.rs b/fastn-core/src/doc.rs
index 56b6a49130..dd6fd4853a 100644
--- a/fastn-core/src/doc.rs
+++ b/fastn-core/src/doc.rs
@@ -26,10 +26,10 @@ fn cached_parse(
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn interpret_helper<'a>(
+pub async fn interpret_helper(
     name: &str,
     source: &str,
-    lib: &'a mut fastn_core::Library2022,
+    lib: &mut fastn_core::Library2022,
     base_url: &str,
     download_assets: bool,
     line_number: usize,
@@ -112,8 +112,8 @@ pub async fn interpret_helper<'a>(
     Ok(document)
 }
 
-pub async fn resolve_import<'a>(
-    lib: &'a mut fastn_core::Library2,
+pub async fn resolve_import(
+    lib: &mut fastn_core::Library2,
     state: &mut ftd::ftd2021::InterpreterState,
     module: &str,
 ) -> ftd::ftd2021::p1::Result<String> {
@@ -159,8 +159,8 @@ pub async fn resolve_import<'a>(
 }
 
 // source, foreign_variable, foreign_function
-pub async fn resolve_import_2022<'a>(
-    lib: &'a mut fastn_core::Library2022,
+pub async fn resolve_import_2022(
+    lib: &mut fastn_core::Library2022,
     _state: &mut ftd::interpreter::InterpreterState,
     module: &str,
     caller_module: &str,
diff --git a/ftd/src/executor/main.rs b/ftd/src/executor/main.rs
index d1c702a512..0f7934c437 100644
--- a/ftd/src/executor/main.rs
+++ b/ftd/src/executor/main.rs
@@ -42,7 +42,7 @@ impl Default for RT {
     }
 }
 
-impl<'a> ExecuteDoc<'a> {
+impl ExecuteDoc<'_> {
     #[tracing::instrument(skip_all)]
     pub fn from_interpreter(document: ftd::interpreter::Document) -> ftd::executor::Result<RT> {
         let mut document = document;
diff --git a/ftd/src/executor/tdoc.rs b/ftd/src/executor/tdoc.rs
index 304a1b1500..9c96d0242c 100644
--- a/ftd/src/executor/tdoc.rs
+++ b/ftd/src/executor/tdoc.rs
@@ -10,7 +10,7 @@ pub struct TDoc<'a> {
     pub rive_data: &'a mut Vec<ftd::executor::RiveData>,
 }
 
-impl<'a> TDoc<'a> {
+impl TDoc<'_> {
     pub(crate) fn itdoc(&self) -> ftd::interpreter::TDoc {
         ftd::interpreter::TDoc::new(self.name, self.aliases, self.bag)
     }
diff --git a/ftd/src/ftd2021/execute_doc.rs b/ftd/src/ftd2021/execute_doc.rs
index bd0c9841ad..1abfd41343 100644
--- a/ftd/src/ftd2021/execute_doc.rs
+++ b/ftd/src/ftd2021/execute_doc.rs
@@ -8,7 +8,7 @@ pub struct ExecuteDoc<'a> {
     pub invocations: &'a mut ftd::Map<Vec<ftd::Map<ftd::Value>>>,
 }
 
-impl<'a> ExecuteDoc<'a> {
+impl ExecuteDoc<'_> {
     pub(crate) fn execute(
         &mut self,
         parent_container: &[usize],
diff --git a/ftd/src/ftd2021/interpreter/tdoc.rs b/ftd/src/ftd2021/interpreter/tdoc.rs
index 278f88ca3d..8b9a6ab5a0 100644
--- a/ftd/src/ftd2021/interpreter/tdoc.rs
+++ b/ftd/src/ftd2021/interpreter/tdoc.rs
@@ -5,7 +5,7 @@ pub struct TDoc<'a> {
     pub bag: &'a ftd::Map<ftd::ftd2021::interpreter::Thing>,
 }
 
-impl<'a> TDoc<'a> {
+impl TDoc<'_> {
     pub fn resolve_name(&self, name: &str) -> String {
         ftd::ftd2021::interpreter::utils::resolve_name(name, self.name, self.aliases)
     }
diff --git a/ftd/src/ftd2021/p2/tdoc.rs b/ftd/src/ftd2021/p2/tdoc.rs
index 063d7a0427..f1d6a0f61d 100644
--- a/ftd/src/ftd2021/p2/tdoc.rs
+++ b/ftd/src/ftd2021/p2/tdoc.rs
@@ -9,7 +9,7 @@ pub struct TDoc<'a> {
     pub referenced_local_variables: &'a mut ftd::Map<String>,
 }
 
-impl<'a> TDoc<'a> {
+impl TDoc<'_> {
     fn get_local_variable<'b>(
         &'b self,
         key: &'b str,
@@ -1147,7 +1147,7 @@ impl<'a> TDoc<'a> {
         }
     }
 
-    pub fn get_root(
+    pub fn get_root<'a>(
         &'a self,
         name: &'a str,
         line_number: usize,
@@ -1181,9 +1181,9 @@ impl<'a> TDoc<'a> {
     // name = foo | alias.foo | a/b#foo
 
     pub fn get_initial_thing(
-        &'a self,
+        &self,
         line_number: usize,
-        name: &'a str,
+        name: &str,
     ) -> ftd::ftd2021::p1::Result<(ftd::ftd2021::p2::Thing, Option<String>)> {
         if name.contains('#') {
             let (name, remaining_value) = {
@@ -1255,9 +1255,9 @@ impl<'a> TDoc<'a> {
     }
 
     pub fn set_value(
-        &'a self,
+        &self,
         line_number: usize,
-        name: &'a str,
+        name: &str,
         value: ftd::Variable,
     ) -> ftd::ftd2021::p1::Result<ftd::Variable> {
         let (initial_thing, remaining) = self.get_initial_thing(line_number, name)?;
@@ -1339,9 +1339,9 @@ impl<'a> TDoc<'a> {
     }
 
     pub fn get_thing(
-        &'a self,
+        &self,
         line_number: usize,
-        name: &'a str,
+        name: &str,
     ) -> ftd::ftd2021::p1::Result<ftd::ftd2021::p2::Thing> {
         let name = if let Some(name) = name.strip_prefix('$') {
             name
diff --git a/ftd/src/html/data.rs b/ftd/src/html/data.rs
index c49c8d29bd..8180bdea1b 100644
--- a/ftd/src/html/data.rs
+++ b/ftd/src/html/data.rs
@@ -2,8 +2,8 @@ pub struct DataGenerator<'a> {
     pub doc: &'a ftd::interpreter::TDoc<'a>,
 }
 
-impl<'a> DataGenerator<'a> {
-    pub(crate) fn new(doc: &'a ftd::interpreter::TDoc<'a>) -> DataGenerator<'a> {
+impl DataGenerator<'_> {
+    pub(crate) fn new<'a>(doc: &'a ftd::interpreter::TDoc<'a>) -> DataGenerator<'a> {
         DataGenerator { doc }
     }
 
diff --git a/ftd/src/html/dependencies.rs b/ftd/src/html/dependencies.rs
index 88de3cd5a1..0586a0555b 100644
--- a/ftd/src/html/dependencies.rs
+++ b/ftd/src/html/dependencies.rs
@@ -5,8 +5,8 @@ pub struct DependencyGenerator<'a> {
     pub doc: &'a ftd::interpreter::TDoc<'a>,
 }
 
-impl<'a> DependencyGenerator<'a> {
-    pub(crate) fn new(
+impl DependencyGenerator<'_> {
+    pub(crate) fn new<'a>(
         id: &'a str,
         node: &'a ftd::node::Node,
         html_data: &'a ftd::node::HTMLData,
diff --git a/ftd/src/html/dummy_html.rs b/ftd/src/html/dummy_html.rs
index 087970d203..1c426218cd 100644
--- a/ftd/src/html/dummy_html.rs
+++ b/ftd/src/html/dummy_html.rs
@@ -5,8 +5,8 @@ pub(crate) struct DummyHtmlGenerator<'a> {
     pub doc: &'a ftd::interpreter::TDoc<'a>,
 }
 
-impl<'a> DummyHtmlGenerator<'a> {
-    pub fn new(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> DummyHtmlGenerator<'a> {
+impl DummyHtmlGenerator<'_> {
+    pub fn new<'a>(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> DummyHtmlGenerator<'a> {
         DummyHtmlGenerator {
             id: id.to_string(),
             doc,
@@ -155,8 +155,8 @@ pub(crate) struct HelperHtmlGenerator<'a> {
     pub doc: &'a ftd::interpreter::TDoc<'a>,
 }
 
-impl<'a> HelperHtmlGenerator<'a> {
-    pub fn new(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> HelperHtmlGenerator<'a> {
+impl HelperHtmlGenerator<'_> {
+    pub fn new<'a>(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> HelperHtmlGenerator<'a> {
         HelperHtmlGenerator {
             id: id.to_string(),
             doc,
diff --git a/ftd/src/html/events.rs b/ftd/src/html/events.rs
index edf53852c1..757cd83905 100644
--- a/ftd/src/html/events.rs
+++ b/ftd/src/html/events.rs
@@ -89,7 +89,7 @@ impl ftd::html::Action {
     }
 }
 
-impl<'a> ftd::html::main::HtmlGenerator<'a> {
+impl ftd::html::main::HtmlGenerator<'_> {
     pub(crate) fn group_by_js_event(
         &self,
         evts: &[ftd::node::Event],
diff --git a/ftd/src/html/main.rs b/ftd/src/html/main.rs
index bc9a64c580..8b1cbb7025 100644
--- a/ftd/src/html/main.rs
+++ b/ftd/src/html/main.rs
@@ -139,8 +139,8 @@ pub(crate) struct HtmlGenerator<'a> {
     pub immutable_variable: Vec<String>,
 }
 
-impl<'a> HtmlGenerator<'a> {
-    pub fn new(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> HtmlGenerator<'a> {
+impl HtmlGenerator<'_> {
+    pub fn new<'a>(id: &str, doc: &'a ftd::interpreter::TDoc<'a>) -> HtmlGenerator<'a> {
         HtmlGenerator {
             id: id.to_string(),
             doc,
diff --git a/ftd/src/html/variable_dependencies.rs b/ftd/src/html/variable_dependencies.rs
index 448f8a074c..749397f78e 100644
--- a/ftd/src/html/variable_dependencies.rs
+++ b/ftd/src/html/variable_dependencies.rs
@@ -3,8 +3,8 @@ pub struct VariableDependencyGenerator<'a> {
     pub doc: &'a ftd::interpreter::TDoc<'a>,
 }
 
-impl<'a> VariableDependencyGenerator<'a> {
-    pub(crate) fn new(
+impl VariableDependencyGenerator<'_> {
+    pub(crate) fn new<'a>(
         id: &'a str,
         doc: &'a ftd::interpreter::TDoc,
     ) -> VariableDependencyGenerator<'a> {
diff --git a/ftd/src/interpreter/main.rs b/ftd/src/interpreter/main.rs
index c3664a3d1e..6727815b3a 100644
--- a/ftd/src/interpreter/main.rs
+++ b/ftd/src/interpreter/main.rs
@@ -825,7 +825,7 @@ impl InterpreterState {
     }
 }
 
-pub fn interpret<'a>(id: &'a str, source: &'a str) -> ftd::interpreter::Result<Interpreter> {
+pub fn interpret(id: &str, source: &str) -> ftd::interpreter::Result<Interpreter> {
     let doc = ParsedDocument::parse_with_line_number(id, source, 0)?;
     interpret_with_line_number(id, doc, 0)
 }
diff --git a/ftd/src/interpreter/utils.rs b/ftd/src/interpreter/utils.rs
index 78d8a64075..ac87d5281b 100644
--- a/ftd/src/interpreter/utils.rs
+++ b/ftd/src/interpreter/utils.rs
@@ -207,11 +207,11 @@ pub(crate) fn get_special_variable() -> Vec<&'static str> {
     ]
 }
 
-pub fn is_argument_in_component_or_loop<'a>(
-    name: &'a str,
-    doc: &'a ftd::interpreter::TDoc,
-    component_definition_name_with_arguments: Option<(&'a str, &'a [String])>,
-    loop_object_name_and_kind: &'a Option<String>,
+pub fn is_argument_in_component_or_loop(
+    name: &str,
+    doc: &ftd::interpreter::TDoc,
+    component_definition_name_with_arguments: Option<(&str, &[String])>,
+    loop_object_name_and_kind: &Option<String>,
 ) -> bool {
     use itertools::Itertools;
 

From 915ce3ebed7a9840e02657486cb7ddff3db9c439 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sat, 4 Nov 2023 17:38:41 +0530
Subject: [PATCH 25/32] removed some Config::read() calls

---
 fastn-core/src/apis/cache.rs       | 12 +++--
 fastn-core/src/apis/clone.rs       |  9 ++--
 fastn-core/src/apis/cr.rs          | 18 +++----
 fastn-core/src/apis/edit.rs        | 31 ++++--------
 fastn-core/src/apis/edit_source.rs | 13 ++++--
 fastn-core/src/apis/sync.rs        | 13 +++---
 fastn-core/src/apis/sync2.rs       | 13 +++---
 fastn-core/src/apis/view_source.rs | 13 ++++--
 fastn-core/src/commands/serve.rs   | 75 +++++++++++++++++-------------
 fastn-core/src/lib.rs              |  2 +-
 10 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/fastn-core/src/apis/cache.rs b/fastn-core/src/apis/cache.rs
index 53a9e6c07c..d98b0fbe14 100644
--- a/fastn-core/src/apis/cache.rs
+++ b/fastn-core/src/apis/cache.rs
@@ -38,7 +38,10 @@ fn query(uri: &str) -> fastn_core::Result<QueryParams> {
     })
 }
 
-pub async fn clear(req: &fastn_core::http::Request) -> fastn_core::http::Response {
+pub async fn clear(
+    config: &fastn_core::Config,
+    req: &fastn_core::http::Request,
+) -> fastn_core::http::Response {
     let query = match query(req.uri()) {
         Ok(q) => q,
         Err(err) => {
@@ -50,7 +53,7 @@ pub async fn clear(req: &fastn_core::http::Request) -> fastn_core::http::Respons
         }
     };
 
-    if let Err(err) = clear_(&query, req).await {
+    if let Err(err) = clear_(config, &query, req).await {
         return fastn_core::server_error!(
             "fastn-Error: /-/clear-cache/, query: {:?}, error: {:?}",
             query,
@@ -62,11 +65,10 @@ pub async fn clear(req: &fastn_core::http::Request) -> fastn_core::http::Respons
 }
 
 pub async fn clear_(
+    config: &fastn_core::Config,
     query: &QueryParams,
     _req: &fastn_core::http::Request,
 ) -> fastn_core::Result<()> {
-    let config =
-        fastn_core::time("Config::read()").it(fastn_core::Config::read(None, false).await?);
     if config.package.download_base_url.is_none() {
         return Err(fastn_core::Error::APIResponseError(
             "cannot remove anything, package does not have `download_base_url`".to_string(),
@@ -111,7 +113,7 @@ pub async fn clear_(
 
     // Download FASTN.ftd again after removing all the content
     if !config.root.join("FASTN.ftd").exists() {
-        fastn_core::commands::serve::download_init_package(config.package.download_base_url)
+        fastn_core::commands::serve::download_init_package(&config.package.download_base_url)
             .await?;
     }
 
diff --git a/fastn-core/src/apis/clone.rs b/fastn-core/src/apis/clone.rs
index 103ccba1ce..a678f16d46 100644
--- a/fastn-core/src/apis/clone.rs
+++ b/fastn-core/src/apis/clone.rs
@@ -5,20 +5,17 @@ pub struct CloneResponse {
     pub reserved_crs: Vec<i32>,
 }
 
-pub async fn clone(
-    req: fastn_core::http::Request,
-) -> fastn_core::Result<fastn_core::http::Response> {
+pub async fn clone(config: &fastn_core::Config) -> fastn_core::Result<fastn_core::http::Response> {
     // TODO: implement authentication
-    match clone_worker(req).await {
+    match clone_worker(config).await {
         Ok(data) => fastn_core::http::api_ok(data),
         Err(err) => fastn_core::http::api_error(err.to_string()),
     }
 }
 
-async fn clone_worker(_req: fastn_core::http::Request) -> fastn_core::Result<CloneResponse> {
+async fn clone_worker(config: &fastn_core::Config) -> fastn_core::Result<CloneResponse> {
     use itertools::Itertools;
 
-    let config = fastn_core::Config::read(None, false).await?;
     let all_files = config
         .get_all_file_path(&config.package, Default::default())?
         .into_iter()
diff --git a/fastn-core/src/apis/cr.rs b/fastn-core/src/apis/cr.rs
index 7b131387ce..1aa2644591 100644
--- a/fastn-core/src/apis/cr.rs
+++ b/fastn-core/src/apis/cr.rs
@@ -4,10 +4,10 @@ pub struct CreateCRRequest {
 }
 
 pub async fn create_cr(
-    req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     cr_req: CreateCRRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    match create_cr_worker(req, cr_req).await {
+    match create_cr_worker(config, cr_req).await {
         Ok(cr_number) => {
             #[derive(serde::Serialize)]
             struct CreateCRResponse {
@@ -21,10 +21,9 @@ pub async fn create_cr(
 }
 
 async fn create_cr_worker(
-    _req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     cr_request: CreateCRRequest,
 ) -> fastn_core::Result<usize> {
-    let config = fastn_core::Config::read(None, false).await?;
     let cr_number = config.extract_cr_number().await?;
     let default_title = format!("CR#{cr_number}");
     let cr_meta = fastn_core::cr::CRMeta {
@@ -32,24 +31,25 @@ async fn create_cr_worker(
         cr_number: cr_number as usize,
         open: true,
     };
-    fastn_core::commands::create_cr::add_cr_to_workspace(&config, &cr_meta).await?;
+    fastn_core::commands::create_cr::add_cr_to_workspace(config, &cr_meta).await?;
     Ok(cr_number as usize)
 }
 
 pub async fn create_cr_page(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    match create_cr_page_worker(req).await {
+    match create_cr_page_worker(config, req).await {
         Ok(body) => Ok(body),
         Err(err) => fastn_core::http::api_error(err.to_string()),
     }
 }
 
 async fn create_cr_page_worker(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = fastn_core::Config::read(None, false).await?;
-    let create_cr_ftd = fastn_core::package_info_create_cr(&config)?;
+    let create_cr_ftd = fastn_core::package_info_create_cr(config)?;
 
     let main_document = fastn_core::Document {
         id: "create-cr.ftd".to_string(),
@@ -59,7 +59,7 @@ async fn create_cr_page_worker(
     };
 
     let mut req_config =
-        fastn_core::RequestConfig::new(&config, &req, main_document.id.as_str(), "/");
+        fastn_core::RequestConfig::new(config, &req, main_document.id.as_str(), "/");
 
     fastn_core::package::package_doc::read_ftd(&mut req_config, &main_document, "/", false, false)
         .await
diff --git a/fastn-core/src/apis/edit.rs b/fastn-core/src/apis/edit.rs
index 75f3ae04b6..f46f3e77e4 100644
--- a/fastn-core/src/apis/edit.rs
+++ b/fastn-core/src/apis/edit.rs
@@ -25,14 +25,11 @@ pub struct EditResponse {
 }
 
 pub async fn edit(
+    config: &fastn_core::Config,
     req: &fastn_core::http::Request,
     req_data: EditRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = match fastn_core::Config::read(None, false).await {
-        Ok(config) => config,
-        Err(err) => return fastn_core::http::api_error(err.to_string()),
-    };
-    let mut req_config = fastn_core::RequestConfig::new(&config, req, "edit.ftd", "/");
+    let mut req_config = fastn_core::RequestConfig::new(config, req, "edit.ftd", "/");
     req_config.current_document = Some(req_data.path.to_string());
 
     match req_config.can_write(req_data.path.as_str()).await {
@@ -60,7 +57,7 @@ pub async fn edit(
 }
 
 pub(crate) async fn edit_worker(
-    config: fastn_core::Config,
+    config: &fastn_core::Config,
     request: EditRequest,
 ) -> fastn_core::Result<EditResponse> {
     if request.is_delete() {
@@ -111,7 +108,7 @@ pub(crate) async fn edit_worker(
         .await
     {
         let snapshots = fastn_core::snapshot::get_latest_snapshots(&config.root).await?;
-        let workspaces = fastn_core::snapshot::get_workspace(&config).await?;
+        let workspaces = fastn_core::snapshot::get_workspace(config).await?;
 
         let file = fastn_core::get_file(
             config.package.name.to_string(),
@@ -150,7 +147,7 @@ pub(crate) async fn edit_worker(
 
     if let Some(before_update_status) = before_update_status {
         let snapshots = fastn_core::snapshot::get_latest_snapshots(&config.root).await?;
-        let workspaces = fastn_core::snapshot::get_workspace(&config).await?;
+        let workspaces = fastn_core::snapshot::get_workspace(config).await?;
         let file = fastn_core::get_file(
             config.package.name.to_string(),
             &config.root.join(&file_name),
@@ -175,13 +172,8 @@ pub(crate) async fn edit_worker(
     })
 }
 
-pub async fn sync() -> fastn_core::Result<fastn_core::http::Response> {
-    let config = match fastn_core::Config::read(None, false).await {
-        Ok(config) => config,
-        Err(err) => return fastn_core::http::api_error(err.to_string()),
-    };
-
-    match fastn_core::commands::sync::sync(&config, None).await {
+pub async fn sync(config: &fastn_core::Config) -> fastn_core::Result<fastn_core::http::Response> {
+    match fastn_core::commands::sync::sync(config, None).await {
         Ok(_) => {
             #[derive(serde::Serialize)]
             struct SyncResponse {
@@ -199,15 +191,10 @@ pub struct RevertRequest {
 }
 
 pub async fn revert(
-    _req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     rev: RevertRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = match fastn_core::Config::read(None, false).await {
-        Ok(config) => config,
-        Err(err) => return fastn_core::http::api_error(err.to_string()),
-    };
-
-    match fastn_core::commands::revert::revert(&config, rev.path.as_str()).await {
+    match fastn_core::commands::revert::revert(config, rev.path.as_str()).await {
         Ok(_) => {
             #[derive(serde::Serialize)]
             struct RevertResponse {
diff --git a/fastn-core/src/apis/edit_source.rs b/fastn-core/src/apis/edit_source.rs
index ad3f060bd4..cb93e8edba 100644
--- a/fastn-core/src/apis/edit_source.rs
+++ b/fastn-core/src/apis/edit_source.rs
@@ -1,4 +1,7 @@
-pub(crate) async fn edit_source(req: &fastn_core::http::Request) -> fastn_core::http::Response {
+pub(crate) async fn edit_source(
+    config: &fastn_core::Config,
+    req: &fastn_core::http::Request,
+) -> fastn_core::http::Response {
     // TODO: Need to remove unwrap
     let path = {
         let mut path: camino::Utf8PathBuf =
@@ -9,7 +12,7 @@ pub(crate) async fn edit_source(req: &fastn_core::http::Request) -> fastn_core::
         path
     };
 
-    match handle_view_source(req, path.as_str()).await {
+    match handle_view_source(config, req, path.as_str()).await {
         Ok(body) => fastn_core::http::ok(body),
         Err(e) => {
             fastn_core::server_error!("new_path: {}, Error: {:?}", path, e)
@@ -18,18 +21,18 @@ pub(crate) async fn edit_source(req: &fastn_core::http::Request) -> fastn_core::
 }
 
 async fn handle_view_source(
+    config: &fastn_core::Config,
     req: &fastn_core::http::Request,
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
-    let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, req, "editor-source.ftd", "/");
+    let mut req_config = fastn_core::RequestConfig::new(config, req, "editor-source.ftd", "/");
 
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
 
     match file {
         fastn_core::File::Ftd(_) | fastn_core::File::Markdown(_) | fastn_core::File::Code(_) => {
-            let editor_ftd = fastn_core::package_editor_source(&config, file_name.as_str())?;
+            let editor_ftd = fastn_core::package_editor_source(config, file_name.as_str())?;
             let main_document = fastn_core::Document {
                 id: "editor-source.ftd".to_string(),
                 content: editor_ftd,
diff --git a/fastn-core/src/apis/sync.rs b/fastn-core/src/apis/sync.rs
index f8475a79be..617c3d2163 100644
--- a/fastn-core/src/apis/sync.rs
+++ b/fastn-core/src/apis/sync.rs
@@ -63,25 +63,24 @@ pub struct SyncRequest {
 /// If conflict occur, Then send back updated version in latest.ftd with conflicted content
 ///
 pub async fn sync(
-    req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     sync_req: SyncRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     dbg!("remote server call", &sync_req.package_name);
 
-    match sync_worker(req, sync_req).await {
+    match sync_worker(config, sync_req).await {
         Ok(data) => fastn_core::http::api_ok(data),
         Err(err) => fastn_core::http::api_error(err.to_string()),
     }
 }
 
 pub(crate) async fn sync_worker(
-    _req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     request: SyncRequest,
 ) -> fastn_core::Result<SyncResponse> {
     use itertools::Itertools;
 
     // TODO: Need to call at once only
-    let config = fastn_core::Config::read(None, false).await?;
     let mut snapshots = fastn_core::snapshot::get_latest_snapshots(&config.root).await?;
     let client_snapshots = fastn_core::snapshot::resolve_snapshots(&request.latest_ftd).await?;
     // let latest_ftd = tokio::fs::read_to_string(config.history_dir().join(".latest.ftd")).await?;
@@ -229,12 +228,12 @@ pub(crate) async fn sync_worker(
         }
     }
 
-    client_current_files(&config, &snapshots, &client_snapshots, &mut synced_files).await?;
+    client_current_files(config, &snapshots, &client_snapshots, &mut synced_files).await?;
 
-    let history_files = clone_history_files(&config, &snapshots, &client_snapshots).await?;
+    let history_files = clone_history_files(config, &snapshots, &client_snapshots).await?;
 
     fastn_core::snapshot::create_latest_snapshots(
-        &config,
+        config,
         &snapshots
             .into_iter()
             .map(|(filename, timestamp)| fastn_core::Snapshot {
diff --git a/fastn-core/src/apis/sync2.rs b/fastn-core/src/apis/sync2.rs
index f21ace4003..a6d2524c05 100644
--- a/fastn-core/src/apis/sync2.rs
+++ b/fastn-core/src/apis/sync2.rs
@@ -110,12 +110,12 @@ pub struct File {
 }
 
 pub async fn sync2(
-    req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     sync_req: SyncRequest,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     dbg!("remote server call", &sync_req.package_name);
 
-    match sync_worker(req, sync_req).await {
+    match sync_worker(config, sync_req).await {
         Ok(data) => fastn_core::http::api_ok(data),
         Err(err) => fastn_core::http::api_error(err.to_string()),
     }
@@ -308,14 +308,13 @@ pub(crate) async fn do_sync(
 }
 
 pub(crate) async fn sync_worker(
-    _req: &fastn_core::http::Request,
+    config: &fastn_core::Config,
     request: SyncRequest,
 ) -> fastn_core::Result<SyncResponse> {
     use itertools::Itertools;
 
     // TODO: Need to call at once only
-    let config = fastn_core::Config::read(None, false).await?;
-    let mut synced_files = do_sync(&config, request.files.as_slice()).await?;
+    let mut synced_files = do_sync(config, request.files.as_slice()).await?;
     let remote_history = config.get_history().await?;
     let remote_manifest =
         fastn_core::history::FileHistory::get_remote_manifest(remote_history.as_slice(), true)?;
@@ -324,9 +323,9 @@ pub(crate) async fn sync_worker(
     let client_latest =
         fastn_core::history::FileHistory::get_remote_manifest(clone_history.as_slice(), true)?;
 
-    client_current_files(&config, &remote_manifest, &client_latest, &mut synced_files).await?;
+    client_current_files(config, &remote_manifest, &client_latest, &mut synced_files).await?;
 
-    let history_files = clone_history_files(&config, &remote_manifest, &client_latest).await?;
+    let history_files = clone_history_files(config, &remote_manifest, &client_latest).await?;
 
     Ok(SyncResponse {
         files: synced_files.into_values().collect_vec(),
diff --git a/fastn-core/src/apis/view_source.rs b/fastn-core/src/apis/view_source.rs
index bba3dcd823..90a866982d 100644
--- a/fastn-core/src/apis/view_source.rs
+++ b/fastn-core/src/apis/view_source.rs
@@ -1,4 +1,7 @@
-pub(crate) async fn view_source(req: &fastn_core::http::Request) -> fastn_core::http::Response {
+pub(crate) async fn view_source(
+    config: &fastn_core::Config,
+    req: &fastn_core::http::Request,
+) -> fastn_core::http::Response {
     // TODO: Need to remove unwrap
     let path = {
         let mut path: camino::Utf8PathBuf =
@@ -9,7 +12,7 @@ pub(crate) async fn view_source(req: &fastn_core::http::Request) -> fastn_core::
         path
     };
 
-    match handle_view_source(req, path.as_str()).await {
+    match handle_view_source(config, req, path.as_str()).await {
         Ok(body) => fastn_core::http::ok(body),
         Err(e) => {
             fastn_core::server_error!("new_path: {}, Error: {:?}", path, e)
@@ -18,11 +21,11 @@ pub(crate) async fn view_source(req: &fastn_core::http::Request) -> fastn_core::
 }
 
 async fn handle_view_source(
+    config: &fastn_core::Config,
     req: &fastn_core::http::Request,
     path: &str,
 ) -> fastn_core::Result<Vec<u8>> {
-    let config = fastn_core::Config::read(None, false).await?;
-    let mut req_config = fastn_core::RequestConfig::new(&config, req, "editor.ftd", "/");
+    let mut req_config = fastn_core::RequestConfig::new(config, req, "editor.ftd", "/");
     let file_name = config.get_file_path_and_resolve(path).await?;
     let file = req_config.get_file_and_package_by_id(path).await?;
 
@@ -30,7 +33,7 @@ async fn handle_view_source(
         fastn_core::File::Ftd(_) | fastn_core::File::Markdown(_) | fastn_core::File::Code(_) => {
             let snapshots = fastn_core::snapshot::get_latest_snapshots(&config.root).await?;
             let diff = get_diff(&file, &snapshots).await;
-            let editor_ftd = fastn_core::package_info_editor(&config, file_name.as_str(), diff)?;
+            let editor_ftd = fastn_core::package_info_editor(config, file_name.as_str(), diff)?;
             let main_document = fastn_core::Document {
                 id: "editor.ftd".to_string(),
                 content: editor_ftd,
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index be55481be9..4caba15e82 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -383,9 +383,9 @@ pub async fn serve(
     })
 }
 
-pub(crate) async fn download_init_package(url: Option<String>) -> std::io::Result<()> {
+pub(crate) async fn download_init_package(url: &Option<String>) -> std::io::Result<()> {
     let mut package = fastn_core::Package::new("unknown-package");
-    package.download_base_url = url;
+    package.download_base_url = url.to_owned();
     package
         .http_download_by_id(
             "FASTN.ftd",
@@ -400,6 +400,7 @@ pub(crate) async fn download_init_package(url: Option<String>) -> std::io::Resul
 }
 
 pub async fn clear_cache(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     fn is_login(req: &fastn_core::http::Request) -> bool {
@@ -416,7 +417,7 @@ pub async fn clear_cache(
     let from = actix_web::web::Query::<Temp>::from_query(req.query_string())?;
     if from.from.eq(&Some("temp-github".to_string())) {
         let _lock = LOCK.write().await;
-        return Ok(fastn_core::apis::cache::clear(&req).await);
+        return Ok(fastn_core::apis::cache::clear(config, &req).await);
     }
     // TODO: Remove After Demo, till here
 
@@ -430,7 +431,7 @@ pub async fn clear_cache(
     }
 
     let _lock = LOCK.write().await;
-    fastn_core::apis::cache::clear(&req).await;
+    fastn_core::apis::cache::clear(config, &req).await;
     // TODO: Redirect to Referrer uri
     return Ok(actix_web::HttpResponse::Found()
         .append_header((actix_web::http::header::LOCATION, "/".to_string()))
@@ -438,70 +439,80 @@ pub async fn clear_cache(
 }
 
 // TODO: Move them to routes folder
-async fn sync(req: fastn_core::http::Request) -> fastn_core::Result<fastn_core::http::Response> {
+async fn sync(
+    config: &fastn_core::Config,
+    req: fastn_core::http::Request,
+) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::sync(&req, req.json()?).await
+    fastn_core::apis::sync(config, req.json()?).await
 }
 
-async fn sync2(req: fastn_core::http::Request) -> fastn_core::Result<fastn_core::http::Response> {
+async fn sync2(
+    config: &fastn_core::Config,
+    req: fastn_core::http::Request,
+) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::sync2(&req, req.json()?).await
+    fastn_core::apis::sync2(config, req.json()?).await
 }
 
-pub async fn clone(
-    req: fastn_core::http::Request,
-) -> fastn_core::Result<fastn_core::http::Response> {
+pub async fn clone(config: &fastn_core::Config) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
-    fastn_core::apis::clone(req).await
+    fastn_core::apis::clone(config).await
 }
 
 pub(crate) async fn view_source(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
-    Ok(fastn_core::apis::view_source(&req).await)
+    Ok(fastn_core::apis::view_source(config, &req).await)
 }
 
 pub(crate) async fn edit_source(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
-    Ok(fastn_core::apis::edit_source(&req).await)
+    Ok(fastn_core::apis::edit_source(config, &req).await)
 }
 
 pub async fn edit(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::edit(&req, req.json()?).await
+    fastn_core::apis::edit(config, &req, req.json()?).await
 }
 
 pub async fn revert(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::edit::revert(&req, req.json()?).await
+    fastn_core::apis::edit::revert(config, req.json()?).await
 }
 
 pub async fn editor_sync(
-    _req: fastn_core::http::Request,
+    config: &fastn_core::Config,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::edit::sync().await
+    fastn_core::apis::edit::sync(config).await
 }
 
 pub async fn create_cr(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.write().await;
-    fastn_core::apis::cr::create_cr(&req, req.json()?).await
+    fastn_core::apis::cr::create_cr(config, req.json()?).await
 }
 
 pub async fn create_cr_page(
+    config: &fastn_core::Config,
     req: fastn_core::http::Request,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     let _lock = LOCK.read().await;
-    fastn_core::apis::cr::create_cr_page(req).await
+    fastn_core::apis::cr::create_cr_page(config, req).await
 }
 
 struct AppData {
@@ -621,18 +632,18 @@ async fn actual_route(
 
     let req = fastn_core::http::Request::from_actix(req, body);
     match (req.method().to_lowercase().as_str(), req.path()) {
-        ("post", "/-/sync/") if cfg!(feature = "remote") => sync(req).await,
-        ("post", "/-/sync2/") if cfg!(feature = "remote") => sync2(req).await,
-        ("get", "/-/clone/") if cfg!(feature = "remote") => clone(req).await,
-        ("get", t) if t.starts_with("/-/view-src/") => view_source(req).await,
-        ("get", t) if t.starts_with("/-/edit-src/") => edit_source(req).await,
+        ("post", "/-/sync/") if cfg!(feature = "remote") => sync(config, req).await,
+        ("post", "/-/sync2/") if cfg!(feature = "remote") => sync2(config, req).await,
+        ("get", "/-/clone/") if cfg!(feature = "remote") => clone(config).await,
+        ("get", t) if t.starts_with("/-/view-src/") => view_source(config, req).await,
+        ("get", t) if t.starts_with("/-/edit-src/") => edit_source(config, req).await,
         ("get", t) if t.starts_with("/-/auth/") => fastn_core::auth::routes::handle_auth(req).await,
-        ("post", "/-/edit/") => edit(req).await,
-        ("post", "/-/revert/") => revert(req).await,
-        ("get", "/-/editor-sync/") => editor_sync(req).await,
-        ("post", "/-/create-cr/") => create_cr(req).await,
-        ("get", "/-/create-cr-page/") => create_cr_page(req).await,
-        ("get", "/-/clear-cache/") => clear_cache(req).await,
+        ("post", "/-/edit/") => edit(config, req).await,
+        ("post", "/-/revert/") => revert(config, req).await,
+        ("get", "/-/editor-sync/") => editor_sync(config).await,
+        ("post", "/-/create-cr/") => create_cr(config, req).await,
+        ("get", "/-/create-cr-page/") => create_cr_page(config, req).await,
+        ("get", "/-/clear-cache/") => clear_cache(config, req).await,
         ("get", "/-/poll/") => fastn_core::watcher::poll().await,
         ("get", "/favicon.ico") => favicon().await,
         ("get", "/test/") => test().await,
@@ -678,7 +689,7 @@ pub async fn listen(
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
 
     if package_download_base_url.is_some() {
-        download_init_package(package_download_base_url).await?;
+        download_init_package(&package_download_base_url).await?;
     }
 
     if cfg!(feature = "controller") {
diff --git a/fastn-core/src/lib.rs b/fastn-core/src/lib.rs
index 15e4f28694..91360f3e27 100644
--- a/fastn-core/src/lib.rs
+++ b/fastn-core/src/lib.rs
@@ -57,7 +57,7 @@ pub(crate) use package::Package;
 pub(crate) use snapshot::Snapshot;
 pub(crate) use tracker::Track;
 pub(crate) use translation::{TranslatedDocument, TranslationData};
-pub(crate) use utils::{copy_dir_all, time, timestamp_nanosecond};
+pub(crate) use utils::{copy_dir_all, timestamp_nanosecond};
 pub(crate) use version::Version;
 pub use {doc::resolve_foreign_variable2, doc::resolve_import};
 

From 951122dda82ba84d1d6f42f0378588151c34f6dd Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sun, 5 Nov 2023 18:03:50 +0530
Subject: [PATCH 26/32] storing app data stuff for current tutorial

---
 fastn-core/src/commands/serve.rs | 35 ++++++++++++--------------------
 fastn-core/src/tutor.rs          | 33 ++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 4caba15e82..4e2a771453 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -515,13 +515,14 @@ pub async fn create_cr_page(
     fastn_core::apis::cr::create_cr_page(config, req).await
 }
 
-struct AppData {
-    edition: Option<String>,
-    external_js: Vec<String>,
-    inline_js: Vec<String>,
-    external_css: Vec<String>,
-    inline_css: Vec<String>,
-    package_name: String,
+#[derive(serde::Deserialize, Default, Clone)]
+pub(crate) struct AppData {
+    pub(crate) edition: Option<String>,
+    pub(crate) external_js: Vec<String>,
+    pub(crate) inline_js: Vec<String>,
+    pub(crate) external_css: Vec<String>,
+    pub(crate) inline_css: Vec<String>,
+    pub(crate) package_name: String,
 }
 
 fn handle_default_route(
@@ -619,14 +620,12 @@ async fn actual_route(
     config: &fastn_core::Config,
     req: actix_web::HttpRequest,
     body: actix_web::web::Bytes,
-    app_data: actix_web::web::Data<AppData>,
+    package_name: &str,
 ) -> fastn_core::Result<fastn_core::http::Response> {
     tracing::info!(method = req.method().as_str(), uri = req.path());
     tracing::info!(tutor_mode = fastn_core::tutor::is_tutor());
 
-    let package_name = &app_data.package_name;
-
-    if let Some(default_response) = handle_default_route(&req, package_name.as_str()) {
+    if let Some(default_response) = handle_default_route(&req, package_name) {
         return Ok(default_response);
     }
 
@@ -649,7 +648,7 @@ async fn actual_route(
         ("get", "/test/") => test().await,
         ("get", "/-/pwd/") => fastn_core::tutor::pwd().await,
         ("get", "/-/tutor.js") => fastn_core::tutor::js().await,
-        ("get", "/-/shutdown/") => fastn_core::tutor::shutdown().await,
+        ("get", "/-/tutor/stop/") => fastn_core::tutor::stop().await,
         (_, _) => serve(config, req).await,
     }
 }
@@ -660,16 +659,8 @@ async fn route(
     body: actix_web::web::Bytes,
     app_data: actix_web::web::Data<AppData>,
 ) -> fastn_core::Result<fastn_core::http::Response> {
-    let config = fastn_core::Config::read(None, false)
-        .await
-        .unwrap()
-        .add_edition(app_data.edition.clone())?
-        .add_external_js(app_data.external_js.clone())
-        .add_inline_js(app_data.inline_js.clone())
-        .add_external_css(app_data.external_css.clone())
-        .add_inline_css(app_data.inline_css.clone());
-
-    actual_route(&config, req, body, app_data).await
+    let (config, package_name) = fastn_core::tutor::config(&app_data).await?;
+    actual_route(&config, req, body, package_name.as_str()).await
 }
 
 //noinspection HttpUrlsUsage
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 7646fbd3e6..ebf8354e73 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -26,13 +26,42 @@ pub async fn js() -> fastn_core::Result<fastn_core::http::Response> {
     Ok(actix_web::HttpResponse::Ok().body(include_bytes!("../tutor.js").to_vec()))
 }
 
-pub async fn shutdown() -> fastn_core::Result<fastn_core::http::Response> {
+pub async fn stop() -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
     }
 
     println!("/-/shutdown/ called, shutting down");
-    std::process::exit(0);
+    *CURRENT_TUTORIAL.write().await = None;
+    fastn_core::http::api_ok("done")
+}
+
+static CURRENT_TUTORIAL: once_cell::sync::Lazy<async_lock::RwLock<Option<Tutorial>>> =
+    once_cell::sync::Lazy::new(|| async_lock::RwLock::new(None));
+
+struct Tutorial {
+    path: String,
+    data: fastn_core::commands::serve::AppData,
+}
+
+pub(crate) async fn config(
+    app_data: &fastn_core::commands::serve::AppData,
+) -> fastn_core::Result<(fastn_core::Config, String)> {
+    let (root, app_data) = match CURRENT_TUTORIAL.read().await.as_ref() {
+        Some(context) => (Some(context.path.clone()), context.data.clone()),
+        None => (None, app_data.clone()),
+    };
+
+    let config = fastn_core::Config::read(root, false)
+        .await
+        .unwrap()
+        .add_edition(app_data.edition)?
+        .add_external_js(app_data.external_js)
+        .add_inline_js(app_data.inline_js)
+        .add_external_css(app_data.external_css)
+        .add_inline_css(app_data.inline_css);
+
+    Ok((config, app_data.package_name))
 }
 
 pub async fn process(

From 5fe48cb7aa00b7c084f09e2afd59dae356abf647 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sun, 5 Nov 2023 19:57:12 +0530
Subject: [PATCH 27/32] /-/tutor/start/

---
 fastn-core/src/commands/serve.rs |  1 +
 fastn-core/src/tutor.rs          | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
index 4e2a771453..41a67dc94a 100644
--- a/fastn-core/src/commands/serve.rs
+++ b/fastn-core/src/commands/serve.rs
@@ -648,6 +648,7 @@ async fn actual_route(
         ("get", "/test/") => test().await,
         ("get", "/-/pwd/") => fastn_core::tutor::pwd().await,
         ("get", "/-/tutor.js") => fastn_core::tutor::js().await,
+        ("post", "/-/tutor/start/") => fastn_core::tutor::start(req.json()?).await,
         ("get", "/-/tutor/stop/") => fastn_core::tutor::stop().await,
         (_, _) => serve(config, req).await,
     }
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index ebf8354e73..df71ee00c5 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -14,6 +14,7 @@ pub async fn main(package_name: String) -> fastn_core::Result<()> {
     )
     .await
 }
+
 pub async fn pwd() -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
@@ -26,12 +27,22 @@ pub async fn js() -> fastn_core::Result<fastn_core::http::Response> {
     Ok(actix_web::HttpResponse::Ok().body(include_bytes!("../tutor.js").to_vec()))
 }
 
+pub async fn start(t: Tutorial) -> fastn_core::Result<fastn_core::http::Response> {
+    if !is_tutor() {
+        return Ok(fastn_core::not_found!("this only works in tutor mode"));
+    }
+
+    println!("/-/start/ called");
+    *CURRENT_TUTORIAL.write().await = Some(t);
+    fastn_core::http::api_ok("done")
+}
+
 pub async fn stop() -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
     }
 
-    println!("/-/shutdown/ called, shutting down");
+    println!("/-/stop/ called, shutting down");
     *CURRENT_TUTORIAL.write().await = None;
     fastn_core::http::api_ok("done")
 }
@@ -39,7 +50,8 @@ pub async fn stop() -> fastn_core::Result<fastn_core::http::Response> {
 static CURRENT_TUTORIAL: once_cell::sync::Lazy<async_lock::RwLock<Option<Tutorial>>> =
     once_cell::sync::Lazy::new(|| async_lock::RwLock::new(None));
 
-struct Tutorial {
+#[derive(serde::Deserialize)]
+pub struct Tutorial {
     path: String,
     data: fastn_core::commands::serve::AppData,
 }

From ecc17ddc2f4d7f083dd19ec06a6c7bd6bcfa9450 Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Sun, 5 Nov 2023 20:10:17 +0530
Subject: [PATCH 28/32] some cleanups

---
 fastn-core/src/library2022/mod.rs |  2 +-
 fastn-core/src/tutor.rs           | 26 +++++++++++---------------
 fastn/src/main.rs                 |  3 +--
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/fastn-core/src/library2022/mod.rs b/fastn-core/src/library2022/mod.rs
index fdcc74a302..4107921f2f 100644
--- a/fastn-core/src/library2022/mod.rs
+++ b/fastn-core/src/library2022/mod.rs
@@ -223,7 +223,7 @@ impl Library2022 {
                 processor::figma_tokens::process_figma_tokens_old(value, kind, doc)
             }
             "http" => processor::http::process(value, kind, doc, self).await,
-            "tutor" => fastn_core::tutor::process(value, kind, doc).await,
+            "tutor-data" => fastn_core::tutor::process(value, kind, doc).await,
             "toc" => processor::toc::process(value, kind, doc),
             "get-data" => processor::get_data::process(value, kind, doc, self),
             "sitemap" => processor::sitemap::process(value, kind, doc, self),
diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index df71ee00c5..60680173a3 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -1,4 +1,4 @@
-pub async fn main(package_name: String) -> fastn_core::Result<()> {
+pub async fn main() -> fastn_core::Result<()> {
     println!("starting TUTOR mode");
     std::env::set_current_dir(std::env::current_dir()?.join(".tutor"))?;
     fastn_core::listen(
@@ -10,7 +10,7 @@ pub async fn main(package_name: String) -> fastn_core::Result<()> {
         vec![],
         vec![],
         vec![],
-        package_name,
+        "the-tutor".to_string(),
     )
     .await
 }
@@ -27,24 +27,21 @@ pub async fn js() -> fastn_core::Result<fastn_core::http::Response> {
     Ok(actix_web::HttpResponse::Ok().body(include_bytes!("../tutor.js").to_vec()))
 }
 
-pub async fn start(t: Tutorial) -> fastn_core::Result<fastn_core::http::Response> {
+async fn set_tutorial(t: Option<Tutorial>) -> fastn_core::Result<fastn_core::http::Response> {
     if !is_tutor() {
         return Ok(fastn_core::not_found!("this only works in tutor mode"));
     }
 
-    println!("/-/start/ called");
-    *CURRENT_TUTORIAL.write().await = Some(t);
+    *CURRENT_TUTORIAL.write().await = t;
     fastn_core::http::api_ok("done")
 }
 
-pub async fn stop() -> fastn_core::Result<fastn_core::http::Response> {
-    if !is_tutor() {
-        return Ok(fastn_core::not_found!("this only works in tutor mode"));
-    }
+pub async fn start(t: Tutorial) -> fastn_core::Result<fastn_core::http::Response> {
+    set_tutorial(Some(t)).await
+}
 
-    println!("/-/stop/ called, shutting down");
-    *CURRENT_TUTORIAL.write().await = None;
-    fastn_core::http::api_ok("done")
+pub async fn stop() -> fastn_core::Result<fastn_core::http::Response> {
+    set_tutorial(None).await
 }
 
 static CURRENT_TUTORIAL: once_cell::sync::Lazy<async_lock::RwLock<Option<Tutorial>>> =
@@ -76,6 +73,7 @@ pub(crate) async fn config(
     Ok((config, app_data.package_name))
 }
 
+/// tutor-data $processor$
 pub async fn process(
     value: ftd::ast::VariableValue,
     kind: ftd::interpreter::Kind,
@@ -87,7 +85,6 @@ pub async fn process(
         ));
     }
 
-    dbg!("tutor process called");
     let state =
         match tokio::fs::read(dirs::home_dir().unwrap().join(".fastn").join("tutor.json")).await {
             Ok(v) => serde_json::from_slice(&v)?,
@@ -102,7 +99,6 @@ pub async fn process(
                 }
             },
         };
-    dbg!(&state);
 
     doc.from_json(&state, &kind, &value)
 }
@@ -116,5 +112,5 @@ struct TutorState {
 pub fn is_tutor() -> bool {
     // https://github.com/orgs/fastn-stack/discussions/1414
     // with either of these are passed we allow APIs like /-/shutdown/, `/-/start/` etc
-    std::env::args().any(|e| e == "tutor" || e == "--tutor")
+    std::env::args().any(|e| e == "tutor")
 }
diff --git a/fastn/src/main.rs b/fastn/src/main.rs
index 66ff856550..a4f982fedf 100644
--- a/fastn/src/main.rs
+++ b/fastn/src/main.rs
@@ -81,7 +81,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
     }
 
     if let Some(_tutor) = matches.subcommand_matches("tutor") {
-        return fastn_core::tutor::main("the-tutor".to_string()).await;
+        return fastn_core::tutor::main().await;
     }
 
     let mut config = fastn_core::Config::read(None, true).await?;
@@ -506,7 +506,6 @@ mod sub_command {
                 .action(clap::ArgAction::Append))
             .arg(clap::arg!(--"css" <URL> "CSS text added in ftd files")
                 .action(clap::ArgAction::Append))
-            .arg(clap::arg!(--"tutor" "Start the server in tutor mode").hide(true))
             .arg(clap::arg!(--"download-base-url" <URL> "If running without files locally, download needed files from here"));
         if cfg!(feature = "remote") {
             serve

From a1db437ea77a8f49d70138454f58d4cd3ac2f5bd Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 6 Nov 2023 10:17:06 +0530
Subject: [PATCH 29/32] done should come from CURRENT_TUTORIAL, not fs

---
 fastn-core/src/tutor.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/fastn-core/src/tutor.rs b/fastn-core/src/tutor.rs
index 60680173a3..d4b5cd635c 100644
--- a/fastn-core/src/tutor.rs
+++ b/fastn-core/src/tutor.rs
@@ -49,7 +49,7 @@ static CURRENT_TUTORIAL: once_cell::sync::Lazy<async_lock::RwLock<Option<Tutoria
 
 #[derive(serde::Deserialize)]
 pub struct Tutorial {
-    path: String,
+    id: String,
     data: fastn_core::commands::serve::AppData,
 }
 
@@ -57,7 +57,7 @@ pub(crate) async fn config(
     app_data: &fastn_core::commands::serve::AppData,
 ) -> fastn_core::Result<(fastn_core::Config, String)> {
     let (root, app_data) = match CURRENT_TUTORIAL.read().await.as_ref() {
-        Some(context) => (Some(context.path.clone()), context.data.clone()),
+        Some(context) => (Some(context.id.clone()), context.data.clone()),
         None => (None, app_data.clone()),
     };
 
@@ -85,13 +85,13 @@ pub async fn process(
         ));
     }
 
-    let state =
+    let fs_state: TutorStateFS =
         match tokio::fs::read(dirs::home_dir().unwrap().join(".fastn").join("tutor.json")).await {
             Ok(v) => serde_json::from_slice(&v)?,
             Err(e) => match dbg!(e.kind()) {
                 std::io::ErrorKind::NotFound => {
                     println!("not found, using default");
-                    TutorState::default()
+                    TutorStateFS::default()
                 }
                 _ => {
                     println!("error: {:?}, {:?}", e, e.kind());
@@ -100,13 +100,23 @@ pub async fn process(
             },
         };
 
+    let state = TutorState {
+        fs_state,
+        current: CURRENT_TUTORIAL.read().await.as_ref().map(|t| t.id.clone()),
+    };
+
     doc.from_json(&state, &kind, &value)
 }
 
-#[derive(Debug, Default, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Default, serde::Serialize)]
 struct TutorState {
+    fs_state: TutorStateFS,
+    current: Option<String>,
+}
+
+#[derive(Debug, Default, serde::Serialize, serde::Deserialize)]
+struct TutorStateFS {
     done: Vec<String>,
-    current: String,
 }
 
 pub fn is_tutor() -> bool {

From 3f3f4a5b2e2b6df814cfbd1c4a73837a439673eb Mon Sep 17 00:00:00 2001
From: Amit Upadhyay <upadhyay@gmail.com>
Date: Mon, 6 Nov 2023 12:27:25 +0530
Subject: [PATCH 30/32] added doctype in document-breakpoint.ftd

---
 ftd/t/js/72-document-breakpoint.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ftd/t/js/72-document-breakpoint.html b/ftd/t/js/72-document-breakpoint.html
index 55534c234e..9dd93d1504 100644
--- a/ftd/t/js/72-document-breakpoint.html
+++ b/ftd/t/js/72-document-breakpoint.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">

From e3ebc00ac4d41c17271b7dd34bc89d61c7c16372 Mon Sep 17 00:00:00 2001
From: Arpita-Jaiswal <ayushipujaa@gmail.com>
Date: Mon, 6 Nov 2023 17:50:40 +0530
Subject: [PATCH 31/32] Fix fonts

---
 fastn-core/src/package/package_doc.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
index 89996d6319..184adc2203 100644
--- a/fastn-core/src/package/package_doc.rs
+++ b/fastn-core/src/package/package_doc.rs
@@ -461,7 +461,6 @@ pub(crate) async fn read_ftd_2023(
     download_assets: bool,
 ) -> fastn_core::Result<FTDResult> {
     let package_name = config.config.package.name.to_string();
-    let font_style = config.config.get_font_style();
     let c = &config.config.clone();
 
     let current_package = config
@@ -520,7 +519,7 @@ pub(crate) async fn read_ftd_2023(
         js_document_script.as_str(),
         js_ast_data.scripts.join("").as_str(),
         ssr_body.as_str(),
-        font_style.as_str(),
+        config.config.get_font_style().as_str(),
         ftd::ftd_js_css(),
         base_url,
         c,

From c7cb58283257f25c178d164f5c4657f9e3b78d54 Mon Sep 17 00:00:00 2001
From: Arpita-Jaiswal <ayushipujaa@gmail.com>
Date: Tue, 7 Nov 2023 16:36:55 +0530
Subject: [PATCH 32/32] Fix fonts for fastn build

---
 fastn-core/src/commands/build.rs | 40 +++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs
index dc5b380fc7..237f98a393 100644
--- a/fastn-core/src/commands/build.rs
+++ b/fastn-core/src/commands/build.rs
@@ -593,20 +593,32 @@ async fn handle_file_(
                 return Ok(());
             }
 
-            let req = fastn_core::http::Request::default();
-            let mut req_config =
-                fastn_core::RequestConfig::new(config, &req, doc.id.as_str(), base_url);
-            req_config.current_document = Some(document.get_id().to_string());
-
-            let resp = fastn_core::package::package_doc::process_ftd(
-                &mut req_config,
-                doc,
-                base_url,
-                build_static_files,
-                test,
-                file_path.as_str(),
-            )
-            .await;
+            let resp = {
+                let req = fastn_core::http::Request::default();
+                let mut req_config =
+                    fastn_core::RequestConfig::new(config, &req, doc.id.as_str(), base_url);
+                req_config.current_document = Some(document.get_id().to_string());
+
+                let resp = fastn_core::package::package_doc::process_ftd(
+                    &mut req_config,
+                    doc,
+                    base_url,
+                    build_static_files,
+                    test,
+                    file_path.as_str(),
+                )
+                .await;
+
+                config.all_packages.borrow_mut().extend(
+                    req_config
+                        .config
+                        .all_packages
+                        .borrow()
+                        .iter()
+                        .map(|(k, v)| (k.clone(), v.clone())),
+                );
+                resp
+            };
 
             match (resp, ignore_failed) {
                 (Ok(r), _) => {