Merge branch 'get-eventually:main' into feat/add-lightswitch-example

Author: zachwaite

.clippy.toml

@@ -0,0 +1,19 @@
+allowed-duplicate-crates = [
+    "thiserror",
+    "thiserror-impl",
+    # These are all coming from eventually-postgres, quite likely sqlx...
+    "hashbrown",
+    "wasi",
+    "windows-sys",
+    "windows-targets",
+    "windows_aarch64_gnullvm",
+    "windows_aarch64_msvc",
+    "windows_i686_gnu",
+    "windows_i686_msvc",
+    "windows_x86_64_gnu",
+    "windows_x86_64_gnullvm",
+    "windows_x86_64_msvc",
+    "zerocopy",
+    "zerocopy-derive",
+    "getrandom",
+]

.editorconfig

@@ -12,4 +12,3 @@ trim_trailing_whitespace = true
 
 [*.{json, md, yaml, yml, proto}]
 indent_size = 2
-

.github/dependabot.yml

@@ -20,20 +20,6 @@ jobs:
             required: false
             toolchain: nightly
 
-    services:
-      postgres:
-        env:
-          POSTGRES_USER: eventually
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: eventually
-        image: postgres:latest
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
     steps:
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -105,7 +91,7 @@ jobs:
           DATABASE_URL: postgres://eventually:password@localhost:5432/eventually?sslmode=disable
 
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5
         with:
           files: lcov.info
 

.github/workflows/ci.yml

@@ -1,6 +1,5 @@
 **/target
 **/*.rs.bk
-Cargo.lock
+/Cargo.lock
 lcov.info
-
 .direnv

.gitignore

@@ -1,4 +1,27 @@
 {
+  "editor.tabSize": 2,
+  "editor.formatOnSave": true,
+  "files.associations": {
+    "*.json5": "jsonc",
+  },
+  "[json][jsonc]": {
+    "editor.defaultFormatter": "vscode.json-language-features",
+    "editor.indentSize": "tabSize",
+  },
+  "[rust]": {
+    "editor.tabSize": 4,
+  },
   "rust-analyzer.cargo.features": "all",
-  "rust-analyzer.check.command": "clippy"
+  "rust-analyzer.check.command": "clippy",
+  "nix.serverPath": "nil",
+  "nix.enableLanguageServer": true,
+  "nix.serverSettings": {
+    "nil": {
+      "formatting": {
+        "command": [
+          "nixpkgs-fmt"
+        ]
+      }
+    }
+  },
 }

.vscode/settings.json

@@ -4,8 +4,7 @@ members = [
     "eventually",
     "eventually-macros",
     "eventually-postgres",
-
-    # Crates as examples
+    # Examples
     "examples/bank-accounting",
     "examples/light-switch",
 ]

Cargo.toml

@@ -20,6 +20,6 @@ keywords = ["architecture", "ddd", "event-sourcing", "cqrs", "es"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.109", features = ["full"] }
-quote = "1.0.35"
+syn = { version = "2.0.100", features = ["full"] }
+quote = "1.0.40"
 eventually = { path = "../eventually" }

eventually-macros/Cargo.toml

@@ -6,7 +6,8 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, AttributeArgs, Fields, ItemStruct, Meta, NestedMeta, Path};
+use syn::punctuated::Punctuated;
+use syn::{parse_macro_input, Fields, ItemStruct, Token, Type};
 
 /// Implements a newtype to use the [`eventually::aggregate::Root`] instance with
 /// user-defined [`eventually::aggregate::Aggregate`] types.
@@ -22,7 +23,7 @@ use syn::{parse_macro_input, AttributeArgs, Fields, ItemStruct, Meta, NestedMeta
 /// being an example of user-defined `Aggregate` type) outside the `eventually` crate (E0116).
 /// Therefore, a newtype that uses `aggregate::Root<T>` is required.
 ///
-/// This attribute macro makes the implementation of a newtype easy, as it Implements
+/// This attribute macro makes the implementation of a newtype easy, as it implements
 /// conversion traits from and to `aggregate::Root<T>` and implements automatic deref
 /// through [`std::ops::Deref`] and [`std::ops::DerefMut`].
 ///
@@ -31,19 +32,14 @@ use syn::{parse_macro_input, AttributeArgs, Fields, ItemStruct, Meta, NestedMeta
 /// This method will panic if the Aggregate Root type is not provided as a macro parameter.
 #[proc_macro_attribute]
 pub fn aggregate_root(args: TokenStream, item: TokenStream) -> TokenStream {
-    let args = parse_macro_input!(args as AttributeArgs);
     let mut item = parse_macro_input!(item as ItemStruct);
     let item_ident = item.ident.clone();
 
-    let aggregate_type = args
-        .first()
-        .and_then(|meta| match meta {
-            NestedMeta::Meta(Meta::Path(Path { segments, .. })) => Some(segments),
-            _ => None,
-        })
-        .and_then(|segments| segments.first())
-        .map(|segment| segment.ident.clone())
-        .expect("the aggregate root type must be provided as macro parameter");
+    let aggregate_type: Type =
+        parse_macro_input!(args with Punctuated::<Type, Token![,]>::parse_terminated)
+            .into_iter()
+            .next()
+            .expect("the aggregate root type must be provided as macro parameter");
 
     item.fields = Fields::Unnamed(
         syn::parse2(quote! { (eventually::aggregate::Root<#aggregate_type>) }).unwrap(),

eventually-macros/src/lib.rs

@@ -12,27 +12,27 @@ categories = ["web-programming", "asynchronous"]
 keywords = ["postgres", "postgresql", "database", "ddd", "event-sourcing"]
 
 [dependencies]
-anyhow = "1.0.80"
+anyhow = "1.0.97"
 async-trait = "0.1.77"
-chrono = "0.4.34"
+chrono = "0.4.40"
 eventually = { path = "../eventually", version = "0.5.0", features = [
     "serde-json",
 ] }
-futures = "0.3.30"
-lazy_static = "1.4.0"
-regex = "1.10.3"
-sqlx = { version = "0.7.3", features = [
+futures = "0.3.31"
+regex = "1.11.1"
+sqlx = { version = "0.8.3", features = [
     "runtime-tokio-rustls",
     "postgres",
     "migrate",
 ] }
-thiserror = "1.0.57"
+thiserror = "2.0.12"
 
 [dev-dependencies]
-tokio = { version = "1.36.0", features = ["macros", "rt"] }
+tokio = { version = "1.44.1", features = ["macros", "rt"] }
 eventually = { path = "../eventually", version = "0.5.0", features = [
     "serde-json",
 ] }
 eventually-macros = { path = "../eventually-macros", version = "0.1.0" }
-serde = { version = "1.0.197", features = ["derive"] }
-rand = "0.8.5"
+serde = { version = "1.0.219", features = ["derive"] }
+rand = "0.9.0"
+testcontainers-modules = { version = "0.11.6", features = ["postgres"] }