Consolidate architecture and rename define_secrets to declare_secrets

- Merge secretspec-core into secretspec as src/config.rs
- Migrate from proc macro #[provider] to declarative macro register_provider\!
- Rename define_secrets\! to declare_secrets\! for better semantic accuracy
- Update all documentation and examples to reflect changes
- Fix UI test expectations for the renamed macro

This simplifies the codebase from 3 crates to 2 while maintaining clear
separation between the main library and derive macro functionality.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: domenkozar

CLAUDE.md

@@ -44,11 +44,12 @@ cd docs && npm run dev
 
 ## Architecture
 
-The project is organized as a Rust workspace with three interdependent crates:
+The project is organized as a Rust workspace with two crates:
 
 1. **secretspec** (src/): Main CLI and library
    - `main.rs`: CLI entry point with command definitions (init, config, set/get, check, run, import)
    - `lib.rs`: Core library with `Secrets` struct, validation logic, and CRUD operations
+   - `config.rs`: Core configuration types (Config, Secret), TOML parsing, and inheritance logic
    - `provider/`: Storage backend implementations with trait-based plugin architecture
 
 2. **secretspec-derive**: Proc macro for type-safe code generation
@@ -57,12 +58,6 @@ The project is organized as a Rust workspace with three interdependent crates:
    - Supports both union types (safe for any profile) and profile-specific types
    - Validates secret names produce valid Rust identifiers
 
-3. **secretspec-core**: Shared type definitions
-   - Core configuration types (Config, Secret)
-   - TOML parsing and serialization
-   - Config file inheritance logic with circular dependency detection
-   - Provider enum definitions
-
 ## Provider System
 
 The provider system uses a trait-based architecture defined in `src/provider/mod.rs`. When implementing new providers:
@@ -140,5 +135,4 @@ Note: Some providers (like `env`) are read-only and will skip write tests.
 - `src/main.rs`: CLI command definitions
 - `src/lib.rs`: Core SecretSpec implementation
 - `secretspec-derive/src/lib.rs`: Code generation macro implementation
-- `secretspec-core/src/lib.rs`: Shared type definitions
 - `tests/integration/provider_tests.rs`: Generic provider test suite

Cargo.lock

@@ -1,5 +1,9 @@
 [workspace]
-members = ["secretspec", "secretspec-derive", "secretspec-core", "examples/derive"]
+members = [
+    "secretspec",
+    "secretspec-derive",
+    "examples/derive",
+]
 resolver = "2"
 
 [workspace.package]
@@ -31,8 +35,7 @@ trybuild = "1.0"
 insta = "1.34"
 linkme = "0.3"
 secretspec-derive = { version = "0.1.0", path = "./secretspec-derive" }
-secretspec-core = { version = "0.1.0", path = "./secretspec-core" }
-secretspec = { version = "0.1.0", path = "./secretspec", features = ["macros"] }
+secretspec = { version = "0.1.0", path = "./secretspec" }
 
 # The profile that 'dist' will build with
 [profile.dist]

Cargo.toml

@@ -137,7 +137,7 @@ Generate strongly-typed Rust structs from your `secretspec.toml`:
 
 ```rust
 // Generate typed structs from secretspec.toml
-secretspec::define_secrets!("secretspec.toml");
+secretspec_derive::declare_secrets!("secretspec.toml");
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Load secrets with type safety

README.md

@@ -142,7 +142,7 @@ The Rust SDK generates strongly-typed structs from your `secretspec.toml`, ensur
 
 ```rust
 // Generate typed structs from secretspec.toml
-secretspec::define_secrets!("secretspec.toml");
+secretspec_derive::declare_secrets!("secretspec.toml");
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Load secrets with type-safe struct

docs/src/content/docs/index.mdx

@@ -20,7 +20,7 @@ pub trait Provider: Send + Sync {
 
 1. **Create provider module** in `src/provider/mybackend.rs`
 2. **Define config struct** with `Serialize`, `Deserialize`, `Default`, and `TryFrom<&Url>`
-3. **Implement provider struct** with the `#[provider]` macro for automatic registration
+3. **Implement provider struct** and use the `register_provider!` macro for automatic registration
 4. **Implement Provider trait** for your provider struct
 5. **Export from mod.rs**: Add `pub mod mybackend;`
 
@@ -60,16 +60,19 @@ impl TryFrom<&Url> for MyBackendConfig {
     }
 }
 
-#[crate::provider(
-    name = "mybackend",
-    description = "My custom backend provider",
-    schemes = ["mybackend"],
-    examples = ["mybackend://api.example.com", "mybackend://localhost:8080"],
-)]
 pub struct MyBackendProvider {
     config: MyBackendConfig,
 }
 
+crate::register_provider! {
+    struct: MyBackendProvider,
+    config: MyBackendConfig,
+    name: "mybackend",
+    description: "My custom backend provider",
+    schemes: ["mybackend"],
+    examples: ["mybackend://api.example.com", "mybackend://localhost:8080"],
+}
+
 impl MyBackendProvider {
     pub fn new(config: MyBackendConfig) -> Self {
         Self { config }

docs/src/content/docs/reference/adding-providers.md

@@ -12,13 +12,14 @@ Add to your `Cargo.toml`:
 ```toml
 [dependencies]
 secretspec = { version = "0.1" }
+secretspec-derive = { version = "0.1" }
 ```
 
 Basic example:
 
 ```rust
 // Generate typed structs from secretspec.toml
-secretspec::define_secrets!("secretspec.toml");
+secretspec_derive::declare_secrets!("secretspec.toml");
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Load secrets using the builder pattern
@@ -51,7 +52,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 The `load_profile()` method on the builder provides profile-specific types for your secrets:
 
 ```rust
-secretspec::define_secrets!("secretspec.toml");
+secretspec_derive::declare_secrets!("secretspec.toml");
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Load secrets with profile-specific types

docs/src/content/docs/sdk/rust.md

@@ -5,6 +5,7 @@ edition.workspace = true
 
 [dependencies]
 secretspec.workspace = true
+secretspec-derive.workspace = true
 url.workspace = true
 serde.workspace = true
 

examples/derive/Cargo.toml

@@ -4,7 +4,7 @@ This example demonstrates how to use SecretSpec's proc macro to create strongly-
 
 ## How it works
 
-1. The `secretspec::define_secrets!()` macro generates Rust structs from `secretspec.toml` at compile time
+1. The `secretspec_derive::declare_secrets!()` macro generates Rust structs from `secretspec.toml` at compile time
 2. The generated types include:
    - `SecretSpec` struct with union types (safe for any profile)
    - `SecretSpecProfile` enum with profile-specific field types

examples/derive/README.md

@@ -1,6 +1,6 @@
 // Use the proc macro to generate typed structs from secretspec.toml
 // This generates: SecretSpec, SecretSpecProfile, Profile, and Provider types
-secretspec::define_secrets!("secretspec.toml");
+secretspec_derive::declare_secrets!("secretspec.toml");
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("SecretSpec Code Generation Example\n");