Change derive

.changepacks/changepack_log_AbTw6598it-Clc46zTOxZ.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide-naming/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch"},"note":"Fix export issue when file has vespertide suffix","date":"2026-02-03T12:05:38.014177500Z"}

.changepacks/changepack_log_i3CUZ3e24HS2YscftMKQD.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-naming/Cargo.toml":"Patch"},"note":"Fix derive","date":"2026-02-03T11:39:47.686761200Z"}

crates/vespertide-cli/src/commands/export.rs

@@ -111,6 +111,9 @@ fn build_output_path(root: &Path, rel_path: &Path, orm: Orm) -> PathBuf {
             (file_name, "")
         };
 
+        // Strip .vespertide suffix if present (e.g., "user.vespertide" -> "user")
+        let stem = strip_vespertide_suffix(stem);
+
         let sanitized = sanitize_filename(stem);
         let ext = match orm {
             Orm::SeaOrm => "rs",
@@ -134,6 +137,12 @@ fn sanitize_filename(name: &str) -> String {
         .collect::<String>()
 }
 
+/// Strip `.vespertide` suffix from a filename stem.
+/// E.g., "user.vespertide" -> "user", "user" -> "user"
+fn strip_vespertide_suffix(stem: &str) -> &str {
+    stem.strip_suffix(".vespertide").unwrap_or(stem)
+}
+
 fn load_models_recursive(base: &Path) -> Result<Vec<(TableDef, PathBuf)>> {
     let mut out = Vec::new();
     if !base.exists() {
@@ -151,6 +160,7 @@ fn ensure_mod_chain(root: &Path, rel_path: &Path) -> Result<()> {
         .filter_map(|c| {
             c.as_os_str()
                 .to_str()
+                .map(strip_vespertide_suffix)
                 .map(|s| sanitize_filename(s).to_string())
         })
         .collect();
@@ -489,6 +499,35 @@ mod tests {
         assert_eq!(out_py, Path::new("src/models/users.py"));
     }
 
+    #[test]
+    fn build_output_path_strips_vespertide_suffix() {
+        use std::path::Path;
+        let root = Path::new("src/models");
+
+        // user.vespertide.json -> user.rs (not user_vespertide.rs)
+        let rel_path = Path::new("user.vespertide.json");
+        let out = build_output_path(root, rel_path, Orm::SeaOrm);
+        assert_eq!(out, Path::new("src/models/user.rs"));
+
+        // Nested path
+        let rel_path2 = Path::new("blog/post.vespertide.yaml");
+        let out2 = build_output_path(root, rel_path2, Orm::SeaOrm);
+        assert_eq!(out2, Path::new("src/models/blog/post.rs"));
+
+        // Python export
+        let out_py = build_output_path(root, rel_path, Orm::SqlAlchemy);
+        assert_eq!(out_py, Path::new("src/models/user.py"));
+    }
+
+    #[rstest]
+    #[case("user.vespertide", "user")]
+    #[case("user", "user")]
+    #[case("user.vespertide.extra", "user.vespertide.extra")]
+    #[case("", "")]
+    fn test_strip_vespertide_suffix(#[case] input: &str, #[case] expected: &str) {
+        assert_eq!(strip_vespertide_suffix(input), expected);
+    }
+
     #[test]
     fn build_output_path_handles_special_path_components() {
         use std::path::Path;

crates/vespertide-config/src/config.rs

@@ -20,28 +20,41 @@ pub struct SeaOrmConfig {
     #[serde(default = "default_extra_enum_derives")]
     pub extra_enum_derives: Vec<String>,
     /// Additional derive macros to add to generated entity model types.
-    #[serde(default)]
+    #[serde(default = "default_extra_model_derives")]
     pub extra_model_derives: Vec<String>,
     /// Naming case for serde rename_all attribute on generated enums.
     /// Default: `Camel` (generates `#[serde(rename_all = "camelCase")]`)
     #[serde(default = "default_enum_naming_case")]
     pub enum_naming_case: NameCase,
+    /// Naming case for serde rename_all attribute on generated models.
+    /// Default: `Camel` (generates `#[serde(rename_all = "camelCase")]`)
+    #[serde(default = "default_model_naming_case")]
+    pub model_naming_case: NameCase,
 }
 
 fn default_extra_enum_derives() -> Vec<String> {
     vec!["vespera::Schema".to_string()]
 }
 
+fn default_extra_model_derives() -> Vec<String> {
+    vec!["vespera::Schema".to_string()]
+}
+
 fn default_enum_naming_case() -> NameCase {
     NameCase::Camel
 }
 
+fn default_model_naming_case() -> NameCase {
+    NameCase::Camel
+}
+
 impl Default for SeaOrmConfig {
     fn default() -> Self {
         Self {
             extra_enum_derives: default_extra_enum_derives(),
-            extra_model_derives: Vec::new(),
+            extra_model_derives: default_extra_model_derives(),
             enum_naming_case: default_enum_naming_case(),
+            model_naming_case: default_model_naming_case(),
         }
     }
 }
@@ -61,6 +74,11 @@ impl SeaOrmConfig {
     pub fn enum_naming_case(&self) -> NameCase {
         self.enum_naming_case
     }
+
+    /// Get the naming case for serde rename_all attribute on generated models.
+    pub fn model_naming_case(&self) -> NameCase {
+        self.model_naming_case
+    }
 }
 
 /// Top-level vespertide configuration.
@@ -191,7 +209,11 @@ mod tests {
             config.seaorm.extra_enum_derives,
             vec!["vespera::Schema".to_string()]
         );
-        assert!(config.seaorm.extra_model_derives.is_empty());
+        assert_eq!(
+            config.seaorm.extra_model_derives,
+            vec!["vespera::Schema".to_string()]
+        );
+        assert_eq!(config.seaorm.model_naming_case, NameCase::Camel);
         assert_eq!(config.prefix, "");
     }
 

crates/vespertide-config/src/lib.rs

@@ -41,7 +41,7 @@ mod tests {
     fn seaorm_config_default_has_vespera_schema() {
         let cfg = SeaOrmConfig::default();
         assert_eq!(cfg.extra_enum_derives(), &["vespera::Schema".to_string()]);
-        assert!(cfg.extra_model_derives().is_empty());
+        assert_eq!(cfg.extra_model_derives(), &["vespera::Schema".to_string()]);
     }
 
     #[test]
@@ -70,7 +70,8 @@ mod tests {
         let json = r#"{}"#;
         let cfg: SeaOrmConfig = serde_json::from_str(json).unwrap();
         assert_eq!(cfg.extra_enum_derives(), &["vespera::Schema".to_string()]);
-        assert!(cfg.extra_model_derives().is_empty());
+        assert_eq!(cfg.extra_model_derives(), &["vespera::Schema".to_string()]);
+        assert_eq!(cfg.model_naming_case(), NameCase::Camel);
     }
 
     #[test]

crates/vespertide-exporter/src/seaorm/mod.rs

@@ -128,6 +128,10 @@ pub fn render_entity_with_config(
 
     lines.push("#[sea_orm::model]".into());
     lines.push(format!("#[derive({})]", model_derives.join(", ")));
+    lines.push(format!(
+        "#[serde(rename_all = \"{}\")]",
+        config.model_naming_case().serde_rename_all()
+    ));
     lines.push(format!(
         "#[sea_orm(table_name = \"{}{}\")]",
         prefix, table.name

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__integer_enum_default_value_snapshots@1.snap

@@ -16,6 +16,7 @@ pub enum TaskStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "tasks")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__integer_enum_default_value_snapshots@pending_status.snap

@@ -16,6 +16,7 @@ pub enum TaskStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "tasks")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_basic_single_pk.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "users")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_composite_pk.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "accounts")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_multiple_columns.snap

@@ -31,6 +31,7 @@ pub enum AvailabilityStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "products")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_nullable.snap

@@ -21,6 +21,7 @@ pub enum TaskPriority {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "tasks")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_shared.snap

@@ -19,6 +19,7 @@ pub enum DocStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "documents")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_special_values.snap

@@ -21,6 +21,7 @@ pub enum EventSeverity {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "events")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_type.snap

@@ -19,6 +19,7 @@ pub enum OrderStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "orders")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_enum_with_default.snap

@@ -19,6 +19,7 @@ pub enum TaskStatus {
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "tasks")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_fk_composite.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "invoices")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_fk_single.snap

@@ -1,13 +1,13 @@
 ---
 source: crates/vespertide-exporter/src/seaorm/mod.rs
-assertion_line: 2004
 expression: rendered
 ---
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_inline_pk.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "users")]
 pub struct Model {
     #[sea_orm(primary_key, default_value = "gen_random_uuid()")]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_jsonb_custom_type.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "json_struct")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_pk_and_fk_together.snap

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "article_user")]
 pub struct Model {
     #[sea_orm(primary_key)]

crates/vespertide-exporter/src/seaorm/snapshots/vespertide_exporter__seaorm__tests__render_entity_snapshots@params_table_level_pk.snap

@@ -1,13 +1,13 @@
 ---
 source: crates/vespertide-exporter/src/seaorm/mod.rs
-assertion_line: 2099
 expression: rendered
 ---
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "orders")]
 pub struct Model {
     #[sea_orm(primary_key)]