Fix tuono_lib_macro crate (#116)

* fix: tuono lib macro

* feat: remove reqwest re-export

* feat: update version to 0.13.1

* fix: remove reqwest from documentation

.github/actions/install-node-dependencies/action.yml

@@ -0,0 +1,37 @@
+name: Install NodeJS Dependencies
+description: This is a composite GitHub Action that sets up pnpm, node and installs the project's dependencies.
+
+inputs:
+  node-version:
+    description: 'Explicit node version. Otherwise fallback reading `.nvmrc`. Use in conjunction with matrix'
+    required: false
+  registry-url:
+    description: 'https://github.com/actions/setup-node?tab=readme-ov-file#usage'
+    required: false
+    default: ''
+
+runs:
+  using: composite
+  steps:
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+
+    - name: Setup Node.js (via input)
+      if: ${{ inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+        registry-url: ${{ inputs.registry-url }}
+        cache: 'pnpm'
+
+    - name: Setup Node.js (via .nvmrc)
+      if: ${{ !inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        registry-url: ${{ inputs.registry-url }}
+        cache: 'pnpm'
+
+    - name: Install Dependencies
+      shell: bash
+      run: pnpm install --frozen-lockfile

.github/workflows/ci-documentation.yml

@@ -13,31 +13,22 @@ on:
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check build
     timeout-minutes: 15
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Setup rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install tuono
-        run: cargo install tuono@0.10.4
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+        run: cargo install tuono@0.12.3
 
       - name: Build project
         working-directory: ./apps/documentation
@@ -45,20 +36,16 @@ jobs:
 
   fmt-lint-and-types:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Check formatting
         run: pnpm docs:format:check

.github/workflows/deploy-documentation.yml

@@ -15,27 +15,17 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Setup rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install tuono
-        run: cargo install tuono@0.10.4
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+        run: cargo install tuono@0.12.3
 
       - name: Build project
         working-directory: ./apps/documentation

.github/workflows/release.yml

@@ -7,24 +7,14 @@ jobs:
   publish-on-npm-dry-run:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
         with:
-          node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Build
         run: pnpm build
 
@@ -36,11 +26,14 @@ jobs:
   publish-on-crates-dry-run:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           override: true
+
       - uses: katyo/publish-crates@v2
         with:
           path: './crates/tuono'
@@ -52,27 +45,17 @@ jobs:
     needs: [publish-on-crates-dry-run, publish-on-npm-dry-run]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
         with:
-          node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
       - name: Clone root README.md on tuono package
         run: cp README.md packages/tuono/README.md
 
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Build
         run: pnpm build
 
@@ -85,11 +68,14 @@ jobs:
     needs: [publish-on-crates-dry-run, publish-on-npm-dry-run]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           override: true
+
       - uses: katyo/publish-crates@v2
         with:
           path: './crates/tuono'

.github/workflows/rust.yml

@@ -10,16 +10,19 @@ on:
       - '.github/**'
       - 'crates/**'
 
-env: 
+env:
   CARGO_TERM_COLOR: always
 
 jobs:
   lint_and_fmt:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint rust crates
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - run: cargo fmt --all -- --check
       - run: cargo clippy -- -D warnings
 
@@ -34,7 +37,9 @@ jobs:
           - beta
           - nightly
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
       - run: cargo build --verbose
       - run: cargo test --verbose

.github/workflows/spell-checking.yml

@@ -7,7 +7,9 @@ jobs:
     name: runner / LanguageTools
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - uses: reviewdog/action-languagetool@v1
         with:
           github_token: ${{ secrets.REVIEWDOG_TOKEN }}

.github/workflows/typescript.yml

@@ -13,25 +13,16 @@ on:
 jobs:
   build-and-test:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check build and test
     timeout-minutes: 15
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Build project
         run: pnpm build
@@ -41,20 +32,16 @@ jobs:
 
   fmt-lint-and-types:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Check formatting
         run: pnpm format:check

.gitignore

@@ -1,12 +1,12 @@
+## Node related ignores
+
 node_modules/
 dist/
 .turbo/
 
 */**/routeTree.gen.ts
 
-pnpm-lock.yaml
-
-examples/playground/
+examples/*/pnpm-lock.yaml
 
 ## Rust related ignores
 

apps/documentation/Cargo.toml

@@ -8,7 +8,7 @@ name = "tuono"
 path = ".tuono/main.rs"
 
 [dependencies]
-tuono_lib = "0.12.0"
+tuono_lib = "0.12.3"
 glob = "0.3.1"
 time = { version = "0.3", features = ["macros"] }
 serde = { version = "1.0.202", features = ["derive"] }

apps/documentation/package.json

@@ -18,7 +18,7 @@
     "clsx": "^2.1.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "tuono": "npm:tuono@0.12.0"
+    "tuono": "npm:tuono@0.12.3"
   },
   "devDependencies": {
     "@types/mdx": "^2.0.13",

apps/documentation/src/components/navbar/actions.tsx

@@ -1,6 +1,10 @@
 import type { JSX } from 'react'
 import { Flex, Button, ActionIcon, Group } from '@mantine/core'
-import { IconBrandGithub, IconBook, IconBrandX } from '@tabler/icons-react'
+import {
+  IconBrandGithub,
+  IconBook,
+  IconBrandDiscord,
+} from '@tabler/icons-react'
 import { Link } from 'tuono'
 
 import ThemeBtn from '../theme-btn'
@@ -8,10 +12,11 @@ import ThemeBtn from '../theme-btn'
 export default function Actions(): JSX.Element {
   return (
     <Flex gap={8}>
-      <Group gap={8} visibleFrom="sm">
+      <Group gap={8}>
         <Button
-          href="/documentation"
           component={Link}
+          href="/documentation"
+          visibleFrom="sm"
           size="compact-lg"
           rightSection={<IconBook />}
           autoContrast
@@ -31,12 +36,12 @@ export default function Actions(): JSX.Element {
         <ActionIcon
           variant="default"
           size="lg"
-          aria-label="We are also on X!"
-          href="https://x.com/tuono_dev"
+          aria-label="Join the Tuono's community on Discord!"
+          href="https://discord.gg/BUvWmmRARx"
           target="_blank"
           component="a"
         >
-          <IconBrandX />
+          <IconBrandDiscord />
         </ActionIcon>
       </Group>
       <ThemeBtn />

apps/documentation/src/components/sidebar/sidebar.tsx

@@ -69,6 +69,12 @@ export default function Sidebar({ close }: { close: () => void }): JSX.Element {
         />
       </SidebarLink>
       <SidebarLink href="/documentation/cli" label="CLI" onClick={close} />
+      <SidebarLink
+        label="Application state"
+        href="/documentation/application-state"
+        onClick={close}
+      />
+
       <SidebarLink
         label="Routing"
         href="/documentation/routing"

apps/documentation/src/routes/documentation/application-state.mdx

@@ -0,0 +1,55 @@
+import MetaTags from '../../components/meta-tags'
+
+<MetaTags
+  title="Tuono - Application state"
+  canonical="https://tuono.dev/documentation/application-state"
+  description="Learn how to add features to your Tuono application"
+/>
+
+import Breadcrumbs, { Element } from '../../components/breadcrumbs'
+
+<Breadcrumbs breadcrumbs={[{ label: 'Application state' }]} />
+
+# Application state
+
+The main reason Tuono is fast it's because it loads just the features that are needed for the project.
+
+To defined them you need to fill the `ApplicationState` struct in the `./src/main.rs` file and they will be automatically available
+in all the handlers you will define across the application.
+
+```rs
+// src/main.rs
+
+#[derive(Clone)]
+pub struct ApplicationState {
+    pub website_name: String,
+	pub base_path: String
+}
+
+pub fn main() -> ApplicationState {
+    let website_name = "tuono".to_string();
+    let base_path = "http://localhost:3000".to_string();
+
+    ApplicationState {
+        website_name,
+        base_path
+    }
+}
+```
+
+> For the sake of simplicity here we just enable a `String` but you can add Database connections or
+> HTTP clients (take a look [here](/documentation/tutorial/api-fetching) for an example with an HTTP client).
+
+Now the `ApplicationState` is available on all the handlers as following:
+
+```rs
+// src/routes/index.rs
+
+#[tuono_lib::handler]
+// The first argument always is the Request
+// The ApplicationState arguments are optional. You can use just the ones you need
+// to use in the handler (with no specific order).
+async fn my_handler(req: Request, website_name: String) -> Response {
+    ...
+}
+```

apps/documentation/src/routes/documentation/tutorial/api-fetching.mdx

@@ -28,7 +28,7 @@ Clear the `index.rs` file and paste:
 ```rust
 // src/routes/index.rs
 use serde::{Deserialize, Serialize};
-use tuono_lib::reqwest::Client;
+use reqwest::Client;
 use tuono_lib::{Props, Request, Response};
 
 const ALL_POKEMON: &str = "https://pokeapi.co/api/v2/pokemon?limit=151";
@@ -56,9 +56,73 @@ async fn get_all_pokemons(_req: Request, fetch: Client) -> Response {
 }
 ```
 
-> The first argument is always the request `req: Request` which contains the request data like the query parameters and the headers.
-> The rest of the arguments are optional and they don't need to be specified
-> if they are not used. Enabled out of the box a [Reqwest](https://docs.rs/reqwest/latest/reqwest/) HTTP client.
+> The first argument is always the request `req: Request` which contains all the request's data like the query parameters and the HTTP headers.
+> The rest of the arguments represents the [ApplicationState](/documentation/application-state) and are optional.
+
+The terminal will complain now for two reasons:
+
+1. We don't have imported any `reqwest` crate
+2. The second argument `fetch: Client` has not been defined yet as global state.
+
+Let's fix these in the next section.
+
+## Application state
+
+Compared to the common Javascript runtimes Tuono is fast because only the features you need for your project will be loaded.
+
+You can load them in the `ApplicationState` of your app inside the `./src/main.rs` file. This is the file that will be executed just once at the very beginning of your application.
+
+> For the tutorial we will use [Reqwest](https://docs.rs/reqwest/latest/reqwest/) which is one of the most famous HTTP library.
+
+To install it just run in your terminal:
+
+```bash
+$ cargo add reqwest
+```
+
+A new entry has just been added to your `Cargo.toml` file.
+
+```diff
+[package]
+name = "tuono"
+version = "0.0.1"
+edition = "2021"
+
+[[bin]]
+name = "tuono"
+path = ".tuono/main.rs"
+
+[dependencies]
+tuono_lib = "0.14.0" # the version might be different
+serde = { version = "1.0.202", features = ["derive"] }
+++ reqwest = "0.12.9" # the version might be different
+```
+
+> The `Cargo.toml` is the manifest file of your application in which handling the Rust's dependencies (similarly as the `package.json` for Javascript).
+
+Now let's define the `ApplicationState` in the `./src/main.rs` file.
+
+```rs
+// Import here the just added reqwest library
+use reqwest::Client;
+
+#[derive(Clone)]
+// Extend this struct with the feature you will need for your application
+pub struct ApplicationState {
+    // This will be available to all your route handlers
+    pub fetch: Client,
+}
+
+pub fn main() -> ApplicationState {
+    let fetch = Client::new();
+    return ApplicationState { fetch };
+}
+```
+
+Now the `fetch: Client` argument is available in the above defined handler and the terminal should not complain anymore.
+Let's see in the next section how to show the fetched data on the browser.
+
+## Handling the page UI
 
 Now the Pokémon are correctly fetched and hydrated on the client side, so we can actually use them. Clear the `index.tsx` file and paste:
 

apps/documentation/src/routes/documentation/tutorial/dynamic-routes.mdx

@@ -32,7 +32,7 @@ Let’s first work on the server side file. Paste into the new `[pokemon].rs` fi
 ```rust
 // src/routes/pokemons/[pokemon].rs
 use serde::{Deserialize, Serialize};
-use tuono_lib::reqwest::Client;
+use reqwest::Client;
 use tuono_lib::{Props, Request, Response};
 
 const POKEMON_API: &str = "https://pokeapi.co/api/v2/pokemon";

apps/documentation/src/routes/documentation/tutorial/error-handling.mdx

@@ -27,8 +27,8 @@ Let's see how it works!
 ```diff
 // src/routes/pokemons/[pokemon].rs
 use serde::{Deserialize, Serialize};
--- use tuono_lib::reqwest::Client;
-++ use tuono_lib::reqwest::{Client, StatusCode};
+-- use reqwest::Client;
+++ use reqwest::{Client, StatusCode};
 use tuono_lib::{Props, Request, Response};
 
 const POKEMON_API: &str = "https://pokeapi.co/api/v2/pokemon";
@@ -69,8 +69,8 @@ async fn get_pokemon(req: Request, fetch: Client) -> Response {
 ```diff
 // src/routes/index.rs
 use serde::{Deserialize, Serialize};
--- use tuono_lib::reqwest::Client;
-++ use tuono_lib::reqwest::{Client, StatusCode};
+-- use reqwest::Client;
+++ use reqwest::{Client, StatusCode};
 use tuono_lib::{Props, Request, Response};
 
 const ALL_POKEMON: &str = "https://pokeapi.co/api/v2/pokemon?limit=151";

crates/tuono/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "tuono"
-version = "0.12.3"
+version = "0.13.1"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"

crates/tuono/src/app.rs

@@ -1,6 +1,9 @@
 use glob::glob;
 use glob::GlobError;
 use std::collections::{hash_map::Entry, HashMap};
+use std::fs::File;
+use std::io::prelude::*;
+use std::io::BufReader;
 use std::path::PathBuf;
 use std::process::Child;
 use std::process::Command;
@@ -15,6 +18,15 @@ const IGNORE_FILES: [&str; 1] = ["__root"];
 pub struct App {
     pub route_map: HashMap<String, Route>,
     pub base_path: PathBuf,
+    pub has_main_file: bool,
+}
+
+fn has_main_file(base_path: PathBuf) -> std::io::Result<bool> {
+    let file = File::open(base_path.join("src/main.rs"))?;
+    let mut buf_reader = BufReader::new(file);
+    let mut contents = String::new();
+    buf_reader.read_to_string(&mut contents)?;
+    Ok(contents.contains("pub fn main"))
 }
 
 impl App {
@@ -23,7 +35,8 @@ impl App {
 
         let mut app = App {
             route_map: HashMap::new(),
-            base_path,
+            base_path: base_path.clone(),
+            has_main_file: has_main_file(base_path).unwrap_or(false),
         };
 
         app.collect_routes();
@@ -119,6 +132,8 @@ mod tests {
             "/home/user/Documents/tuono/src/routes/index.rs",
             "/home/user/Documents/tuono/src/routes/posts/index.rs",
             "/home/user/Documents/tuono/src/routes/posts/[post].rs",
+            "/home/user/Documents/tuono/src/routes/posts/handle-this.rs",
+            "/home/user/Documents/tuono/src/routes/posts/handle-this/[post].rs",
             "/home/user/Documents/tuono/src/routes/posts/UPPERCASE.rs",
             "/home/user/Documents/tuono/src/routes/sitemap.xml.rs",
         ];
@@ -132,6 +147,11 @@ mod tests {
             ("/about", "about"),
             ("/posts/index", "posts_index"),
             ("/posts/[post]", "posts_dyn_post"),
+            ("/posts/handle-this", "posts_handle_hyphen_this"),
+            (
+                "/posts/handle-this/[post]",
+                "posts_handle_hyphen_this_dyn_post",
+            ),
             ("/posts/UPPERCASE", "posts_uppercase"),
             ("/sitemap.xml", "sitemap_dot_xml"),
         ];

crates/tuono/src/route.rs

@@ -32,6 +32,7 @@ impl AxumInfo {
             .to_string()
             .replace('/', "_")
             .replace('.', "_dot_")
+            .replace('-', "_hyphen_")
             .to_lowercase();
 
         if axum_route.is_empty() {
@@ -47,6 +48,7 @@ impl AxumInfo {
                     .as_str()
                     .to_string()
                     .replace('/', "_")
+                    .replace('-', "_hyphen_")
                     .replace('[', "dyn_")
                     .replace(']', ""),
                 axum_route: axum_route.replace('[', ":").replace(']', ""),

crates/tuono/src/source_builder.rs

@@ -42,12 +42,17 @@ const MODE: Mode = /*MODE*/;
 
 // MODULE_IMPORTS
 
+//MAIN_FILE_IMPORT//
+
 #[tokio::main]
 async fn main() {
     println!("\n  ⚡ Tuono v/*VERSION*/");
+
+    //MAIN_FILE_DEFINITION//
+
     let router = Router::new()
         // ROUTE_BUILDER
-        ;
+        //MAIN_FILE_USAGE//;
 
     Server::init(router, MODE).start().await
 }
@@ -131,7 +136,33 @@ fn generate_axum_source(app: &App, mode: Mode) -> String {
             &create_modules_declaration(&app.route_map),
         )
         .replace("/*VERSION*/", crate_version!())
-        .replace("/*MODE*/", mode.as_str());
+        .replace("/*MODE*/", mode.as_str())
+        .replace(
+            "//MAIN_FILE_IMPORT//",
+            if app.has_main_file {
+                r#"#[path="../src/main.rs"]
+                    mod tuono_main_state;
+                    "#
+            } else {
+                ""
+            },
+        )
+        .replace(
+            "//MAIN_FILE_DEFINITION//",
+            if app.has_main_file {
+                "let user_custom_state = tuono_main_state::main();"
+            } else {
+                ""
+            },
+        )
+        .replace(
+            "//MAIN_FILE_USAGE//",
+            if app.has_main_file {
+                ".with_state(user_custom_state)"
+            } else {
+                ""
+            },
+        );
 
     let has_server_handlers = app
         .route_map

crates/tuono_lib/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "tuono_lib"
-version = "0.12.3"
+version = "0.13.1"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"
@@ -30,7 +31,7 @@ either = "1.13.0"
 tower-http = {version = "0.6.0", features = ["fs"]}
 colored = "2.1.0"
 
-tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.12.3"}
+tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.13.1"}
 # Match the same version used by axum
 tokio-tungstenite = "0.24.0"
 futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }

crates/tuono_lib/src/lib.rs

@@ -19,5 +19,4 @@ pub use tuono_lib_macros::handler;
 
 // Re-exports
 pub use axum;
-pub use reqwest;
 pub use tokio;

crates/tuono_lib/src/server.rs

@@ -14,12 +14,12 @@ const DEV_PUBLIC_DIR: &str = "public";
 const PROD_PUBLIC_DIR: &str = "out/client";
 
 pub struct Server {
-    router: Router<reqwest::Client>,
+    router: Router,
     mode: Mode,
 }
 
 impl Server {
-    pub fn init(router: Router<reqwest::Client>, mode: Mode) -> Server {
+    pub fn init(router: Router, mode: Mode) -> Server {
         Ssr::create_platform();
 
         GLOBAL_MODE.set(mode).unwrap();
@@ -34,8 +34,6 @@ impl Server {
     pub async fn start(&self) {
         let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
 
-        let fetch = reqwest::Client::new();
-
         if self.mode == Mode::Dev {
             println!("  Ready at: {}\n", "http://localhost:3000".blue().bold());
             let router = self
@@ -47,8 +45,7 @@ impl Server {
                 .fallback_service(
                     ServeDir::new(DEV_PUBLIC_DIR)
                         .fallback(get(catch_all).layer(LoggerLayer::new())),
-                )
-                .with_state(fetch);
+                );
 
             axum::serve(listener, router)
                 .await
@@ -65,8 +62,7 @@ impl Server {
                 .fallback_service(
                     ServeDir::new(PROD_PUBLIC_DIR)
                         .fallback(get(catch_all).layer(LoggerLayer::new())),
-                )
-                .with_state(fetch);
+                );
 
             axum::serve(listener, router)
                 .await

crates/tuono_lib/src/vite_reverse_proxy.rs

@@ -1,5 +1,5 @@
 use axum::body::Body;
-use axum::extract::{Path, State};
+use axum::extract::Path;
 
 use axum::http::{HeaderName, HeaderValue};
 use axum::response::{IntoResponse, Response};
@@ -7,10 +7,9 @@ use reqwest::Client;
 
 const VITE_URL: &str = "http://localhost:3001/vite-server";
 
-pub async fn vite_reverse_proxy(
-    State(client): State<Client>,
-    Path(path): Path<String>,
-) -> impl IntoResponse {
+pub async fn vite_reverse_proxy(Path(path): Path<String>) -> impl IntoResponse {
+    let client = Client::new();
+
     match client.get(format!("{VITE_URL}/{path}")).send().await {
         Ok(res) => {
             let mut response_builder = Response::builder().status(res.status().as_u16());

crates/tuono_lib_macros/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "tuono_lib_macros"
-version = "0.12.3"
+version = "0.13.1"
 edition = "2021"
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"

crates/tuono_lib_macros/src/handler.rs

@@ -2,15 +2,35 @@ use proc_macro::TokenStream;
 use quote::quote;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
-use syn::{parse2, parse_macro_input, FnArg, ItemFn, Pat, Type};
+use syn::{parse2, parse_macro_input, parse_quote, FnArg, ItemFn, Pat, Stmt};
 
-fn create_struct_fn_arg(arg_name: Pat, arg_type: Type) -> FnArg {
+fn create_struct_fn_arg() -> FnArg {
     parse2(quote! {
-        tuono_lib::axum::extract::State(#arg_name): tuono_lib::axum::extract::State<#arg_type>
+        tuono_lib::axum::extract::State(state): tuono_lib::axum::extract::State<ApplicationState>
     })
     .unwrap()
 }
 
+fn import_main_application_state(argument_names: Punctuated<Pat, Comma>) -> Option<Stmt> {
+    if !argument_names.is_empty() {
+        let local: Stmt = parse_quote!(
+            use crate::tuono_main_state::ApplicationState;
+        );
+        return Some(local);
+    }
+
+    None
+}
+
+fn crate_application_state_extractor(argument_names: Punctuated<Pat, Comma>) -> Option<Stmt> {
+    if !argument_names.is_empty() {
+        let use_item: Stmt = parse_quote!(let ApplicationState { #argument_names } = state;);
+        return Some(use_item);
+    }
+
+    None
+}
+
 fn params_argument() -> FnArg {
     parse2(quote! {
         tuono_lib::axum::extract::Path(params): tuono_lib::axum::extract::Path<
@@ -41,23 +61,33 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
             continue;
         }
 
+        if i == 1 {
+            axum_arguments.insert(1, create_struct_fn_arg())
+        }
+
         if let FnArg::Typed(pat_type) = arg {
             let index = i - 1;
             let argument_name = *pat_type.pat.clone();
-            let argument_type = *pat_type.ty.clone();
             argument_names.insert(index, argument_name.clone());
-            axum_arguments.insert(index, create_struct_fn_arg(argument_name, argument_type))
         }
     }
 
     axum_arguments.insert(axum_arguments.len(), request_argument());
 
+    let application_state_extractor = crate_application_state_extractor(argument_names.clone());
+    let application_state_import = import_main_application_state(argument_names.clone());
+
     quote! {
+        #application_state_import
+
         #item
 
         pub async fn route(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {
+
+            #application_state_extractor
+
            let pathname = request.uri();
            let headers = request.headers();
 
@@ -69,6 +99,9 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
         pub async fn api(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {
+
+            #application_state_extractor
+
            let pathname = request.uri();
            let headers = request.headers();
 

examples/tutorial/Cargo.toml

@@ -10,4 +10,5 @@ path = ".tuono/main.rs"
 [dependencies]
 tuono_lib = { path = "../../crates/tuono_lib/"}
 serde = { version = "1.0.202", features = ["derive"] }
+reqwest = "0.12.9"
 

examples/tutorial/src/main.rs

@@ -0,0 +1,11 @@
+use reqwest::Client;
+
+#[derive(Clone)]
+pub struct ApplicationState {
+    pub fetch: Client,
+}
+
+pub fn main() -> ApplicationState {
+    let fetch = Client::new();
+    return ApplicationState { fetch };
+}

examples/tutorial/src/routes/index.rs

@@ -1,6 +1,6 @@
 // src/routes/index.rs
+use reqwest::{Client, StatusCode};
 use serde::{Deserialize, Serialize};
-use tuono_lib::reqwest::{Client, StatusCode};
 use tuono_lib::{Props, Request, Response};
 
 const ALL_POKEMON: &str = "https://pokeapi.co/api/v2/pokemon?limit=151";

examples/tutorial/src/routes/pokemons/[pokemon].rs

@@ -1,6 +1,6 @@
 // src/routes/pokemons/[pokemon].rs
+use reqwest::{Client, StatusCode};
 use serde::{Deserialize, Serialize};
-use tuono_lib::reqwest::{Client, StatusCode};
 use tuono_lib::{Props, Request, Response};
 
 const POKEMON_API: &str = "https://pokeapi.co/api/v2/pokemon";

packages/fs-router-vite-plugin/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono-fs-router-vite-plugin",
-  "version": "0.12.3",
+  "version": "0.13.1",
   "description": "Plugin for the tuono's file system router. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

packages/lazy-fn-vite-plugin/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono-lazy-fn-vite-plugin",
-  "version": "0.12.3",
+  "version": "0.13.1",
   "description": "Plugin for the tuono's lazy fn. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

packages/router/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono-router",
-  "version": "0.12.3",
+  "version": "0.13.1",
   "description": "React routing component for the framework tuono. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

packages/tuono/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono",
-  "version": "0.12.3",
-  "description": "The react/rust fullstack framework",
+  "version": "0.13.1",
+  "description": "Superfast React fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",