settingspec 0.8.0__tar.gz → 0.9.0__tar.gz

{settingspec-0.8.0 → settingspec-0.9.0}/Cargo.lock

@@ -163,9 +163,9 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "arc-swap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e"
 dependencies = [
  "rustversion",
 ]
@@ -414,7 +414,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -630,7 +630,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -660,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "errno"
@@ -815,7 +815,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -881,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988"
+checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1050,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f"
+checksum = "484be5657551d7868d67587df967fb4fcbe9d266a761cc855aaa148fda0b3cc7"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -1144,18 +1144,18 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
 dependencies = [
  "spin",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libm"
@@ -1292,9 +1292,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8"
 dependencies = [
  "objc2-encode",
 ]
@@ -1503,7 +1503,7 @@ dependencies = [
  "proc-macro-error-attr3",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1614,9 +1614,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.12.0"
+version = "8.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9"
+checksum = "19afa5b4b6a611de00bd1bdae6ae6f39084c9399f0679c3f52d8469cf335cc23"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -1625,9 +1625,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.12.0"
+version = "8.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097"
+checksum = "e0d8afda6374eac59e066abee06d265247ebbaf3006cf878e2879e8356e34053"
 dependencies = [
  "mime_guess",
  "proc-macro2",
@@ -1639,11 +1639,11 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.12.0"
+version = "8.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0"
+checksum = "0d84e8ba78bd384263e5922f084cbe1b081c3b7e69add59c8fb097b879ba968a"
 dependencies = [
- "sha2 0.11.0",
+ "sha2 0.11.1",
  "walkdir",
 ]
 
@@ -1664,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d"
+checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa"
 dependencies = [
  "bitflags",
  "errno",
@@ -1783,14 +1783,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1801,9 +1801,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
 dependencies = [
  "serde_core",
 ]
@@ -1823,7 +1823,7 @@ dependencies = [
 
 [[package]]
 name = "settingspec"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "age",
  "anyhow",
@@ -1838,7 +1838,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "toml 1.1.6+spec-1.1.0",
+ "toml 1.1.8+spec-1.1.0",
 ]
 
 [[package]]
@@ -1854,9 +1854,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.1",
@@ -1891,9 +1891,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.16.2"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 
 [[package]]
 name = "spin"
@@ -1936,9 +1936,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2000,14 +2000,14 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "tinystr"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"
+checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a"
 dependencies = [
  "displaydoc",
  "serde_core",
@@ -2025,9 +2025,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.1.6+spec-1.1.0"
+version = "1.1.8+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a"
+checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -2040,27 +2040,27 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.1.3+spec-1.1.0"
+version = "1.1.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
 
 [[package]]
 name = "type-map"
@@ -2098,15 +2098,15 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "universal-hash"
@@ -2205,18 +2205,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.59"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.59"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2231,9 +2231,9 @@ checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 
 [[package]]
 name = "zeroize"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879"
 dependencies = [
  "zeroize_derive",
 ]
@@ -2251,9 +2251,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
+checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40"
 dependencies = [
  "serde",
  "zerofrom",

{settingspec-0.8.0 → settingspec-0.9.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "settingspec"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2024"
 description = "One file for all environments, all languages, all submodules."
 readme = "README.md"

{settingspec-0.8.0 → settingspec-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: settingspec
-Version: 0.8.0
+Version: 0.9.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -17,8 +17,6 @@ Project-URL: Source Code, https://github.com/sayanarijit/settingspec
 
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://s15.gifyu.com/images/buXVO.png">
-    <source media="(prefers-color-scheme: light)" srcset="https://s15.gifyu.com/images/buXZJ.png">
     <img alt="The settingspec cover" width="100%" src="https://s15.gifyu.com/images/buXZJ.png">
   </picture>
 </p>
@@ -219,8 +217,8 @@ Too simple? Use [Cottage](https://cottage-cli.pages.dev) or [agebox](https://git
 
 ```toml
 [spec]
-envfile.default = ".env.cott.age"
-# envfile.default = ".env.agebox"
+envfile = ".env.cott.age"
+# envfile = ".env.agebox"
 
 decryption.key.path = "~/.config/cottage/identity:~/.ssh"
 decryption.key.env = "COTTAGE_IDENTITY"

{settingspec-0.8.0 → settingspec-0.9.0}/README.md

@@ -1,7 +1,5 @@
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://s15.gifyu.com/images/buXVO.png">
-    <source media="(prefers-color-scheme: light)" srcset="https://s15.gifyu.com/images/buXZJ.png">
     <img alt="The settingspec cover" width="100%" src="https://s15.gifyu.com/images/buXZJ.png">
   </picture>
 </p>
@@ -202,8 +200,8 @@ Too simple? Use [Cottage](https://cottage-cli.pages.dev) or [agebox](https://git
 
 ```toml
 [spec]
-envfile.default = ".env.cott.age"
-# envfile.default = ".env.agebox"
+envfile = ".env.cott.age"
+# envfile = ".env.agebox"
 
 decryption.key.path = "~/.config/cottage/identity:~/.ssh"
 decryption.key.env = "COTTAGE_IDENTITY"

{settingspec-0.8.0 → settingspec-0.9.0}/src/cli.rs

@@ -80,8 +80,7 @@ profile.options = ["local", "prod"]
 profile.default = "local"  # Switch via $SETTINGSPEC_PROFILE
 
 [settings]
-key._.local.val = "local"
-key._.prod.env = "KEY"  # Load from $KEY when active profile is "prod"
+key._.default.val = "value"
 "#;
 
 pub fn init_config() -> Result<()> {
@@ -171,9 +170,8 @@ pub fn run_cli() -> Result<()> {
     match cli.command {
         Commands::Init => init_config(),
         Commands::Check => {
-            // Check only validates config syntax, profiles, env vars without creating files
-            load_and_resolve()?;
-            Ok(())
+            let ctx = load_and_resolve()?;
+            validate_exports(&ctx)
         }
         Commands::Export => {
             let ctx = load_and_resolve()?;
@@ -271,6 +269,31 @@ fn run_watch() -> Result<()> {
     Ok(())
 }
 
+/// Generates every configured export in memory, without writing anything, so
+/// that unsupported combinations are reported by `check`.
+fn validate_exports(ctx: &ExecutionContext) -> Result<()> {
+    let resolve = ctx.doc.spec.export.resolve;
+
+    for (file_path_str, filter) in &ctx.doc.spec.export.file {
+        if *filter == ExportFilter::Disabled {
+            continue;
+        }
+        let filtered_settings: Vec<ResolvedSetting> = ctx
+            .resolved_settings
+            .iter()
+            .filter(|s| matches_filter(filter, s))
+            .cloned()
+            .collect();
+        generate_by_path(Path::new(file_path_str), &filtered_settings, resolve)?;
+    }
+
+    if let Some(ref stdout_fmt) = ctx.doc.spec.export.stdout {
+        generate_by_format(stdout_fmt, &ctx.resolved_settings, resolve)?;
+    }
+
+    Ok(())
+}
+
 fn perform_export(ctx: &ExecutionContext) -> Result<Vec<PathBuf>> {
     auto_append_gitignore(ctx)?;
 
@@ -290,14 +313,18 @@ fn perform_export(ctx: &ExecutionContext) -> Result<Vec<PathBuf>> {
             .collect();
 
         let path = Path::new(file_path_str);
-        let output = generate_by_path(path, &filtered_settings)?;
+        let output = generate_by_path(path, &filtered_settings, ctx.doc.spec.export.resolve)?;
         write_export_file(path, &output, ctx.doc.spec.export.mode)?;
         generated_files.push(path.to_path_buf());
     }
 
     // 2. Stdout export if configured
     if let Some(ref stdout_fmt) = ctx.doc.spec.export.stdout {
-        let output = generate_by_format(stdout_fmt, &ctx.resolved_settings)?;
+        let output = generate_by_format(
+            stdout_fmt,
+            &ctx.resolved_settings,
+            ctx.doc.spec.export.resolve,
+        )?;
         print!("{}", output);
     }
 
@@ -329,7 +356,7 @@ fn execute_run(ctx: &ExecutionContext, command_args: &[String]) -> Result<()> {
     })?;
 
     let stdin_payload = if let Some(ref stdin_fmt) = ctx.doc.spec.export.stdin {
-        Some(generate_by_format(stdin_fmt, &ctx.resolved_settings)?)
+        Some(generate_by_format(stdin_fmt, &ctx.resolved_settings, true)?)
     } else {
         None
     };

{settingspec-0.8.0 → settingspec-0.9.0}/src/error.rs

@@ -23,6 +23,10 @@ pub enum SettingSpecError {
     EnvFileNotFound(String),
     DecryptionFailed(String, String), // profile, file
     InvalidExportFormat(String),
+    UnresolvedExportUnsupported(String, String), // format, setting key
+    UnsupportedType(String, String),             // format, setting key
+    InconsistentEnvDirective(String, String),    // setting key, profile
+    EnvFallbackUnsupported(String, String),      // format, setting key
     IoError(String),
     CommandFailed(i32),
 }
@@ -112,6 +116,26 @@ impl fmt::Display for SettingSpecError {
                 file, profile
             ),
             Self::InvalidExportFormat(fmt) => write!(f, "Unsupported export format: '{}'", fmt),
+            Self::UnresolvedExportUnsupported(fmt, key) => write!(
+                f,
+                "Setting '{}' reads an environment variable, which '{}' exports cannot reference; set spec.export.resolve = true",
+                key, fmt
+            ),
+            Self::UnsupportedType(fmt, key) => write!(
+                f,
+                "The type of setting '{}' (a union, optional, or environment-backed value) cannot be expressed in '{}' exports",
+                key, fmt
+            ),
+            Self::InconsistentEnvDirective(k, p) => write!(
+                f,
+                "Setting '{}' uses an 'env' directive in some profiles but not in profile '{}'; with spec.export.resolve = false every profile must use 'env' (fallbacks allowed)",
+                k, p
+            ),
+            Self::EnvFallbackUnsupported(fmt, key) => write!(
+                f,
+                "Setting '{}' has an 'env' directive with a 'val'/'null' fallback, which '{}' exports cannot express; set spec.export.resolve = true or remove the fallback",
+                key, fmt
+            ),
             Self::IoError(msg) => write!(f, "I/O error: {}", msg),
             Self::CommandFailed(code) => write!(f, "Child command exited with code {}", code),
         }

{settingspec-0.8.0 → settingspec-0.9.0}/src/generator/c.rs

@@ -1,4 +1,6 @@
-use super::common::{format_scalar_literal, is_valid_identifier};
+use super::common::{
+    Leaf, env_name_literal, format_scalar_literal, has_env_refs, is_valid_identifier, leaf_of,
+};
 use super::tree::{ConfigNode, build_config_tree};
 use crate::error::Result;
 use crate::model::ResolvedSetting;
@@ -11,11 +13,32 @@ pub fn generate_c(settings: &[ResolvedSetting]) -> Result<String> {
         "/* Generated by SettingSpec */\n\n#ifndef SETTINGS_H\n#define SETTINGS_H\n\n#include <stdbool.h>\n#include <stddef.h>\n\n",
     );
 
+    if has_env_refs(settings) {
+        out = out.replacen(
+            "#include <stddef.h>\n",
+            "#include <stddef.h>\n#include <stdlib.h>\n",
+            1,
+        );
+    }
+
     let mut struct_defs = String::new();
     let root_type = generate_c_structs(&tree, "Settings", &mut struct_defs);
 
     out.push_str(&struct_defs);
 
+    let mut env_names = Vec::new();
+    collect_env_names(&tree, &mut env_names);
+    for name in &env_names {
+        out.push_str(&format!(
+            "static inline const char* {}(void) {{ return getenv({}); }}\n",
+            env_getter_name(name),
+            env_name_literal(name)
+        ));
+    }
+    if !env_names.is_empty() {
+        out.push('\n');
+    }
+
     let mut init_vals = String::new();
     format_c_init(&tree, 1, &mut init_vals);
 
@@ -27,6 +50,24 @@ pub fn generate_c(settings: &[ResolvedSetting]) -> Result<String> {
     Ok(out)
 }
 
+/// Name of the generated function that reads the environment variable `name`.
+fn env_getter_name(name: &str) -> String {
+    format!(
+        "settings_getenv_{}",
+        name.replace(|c: char| !c.is_ascii_alphanumeric(), "_")
+    )
+}
+
+fn collect_env_names(map: &IndexMap<String, ConfigNode>, names: &mut Vec<String>) {
+    for node in map.values() {
+        match node {
+            ConfigNode::Env(r) if !names.contains(&r.name) => names.push(r.name.clone()),
+            ConfigNode::Map(sub_map) => collect_env_names(sub_map, names),
+            _ => {}
+        }
+    }
+}
+
 fn generate_c_structs(
     map: &IndexMap<String, ConfigNode>,
     struct_name: &str,
@@ -37,8 +78,17 @@ fn generate_c_structs(
     for (k, node) in map {
         let field_name = sanitize_c_identifier(k);
         match node {
-            ConfigNode::Null => {
-                fields.push(format!("    const void* {};", field_name));
+            // Only string settings (possibly NULL or read from the environment)
+            // are typed; everything else is rejected before formatting.
+            ConfigNode::Typed(shape, inner) => {
+                if shape.has_env && matches!(leaf_of(inner), Some(Leaf::Env(_))) {
+                    fields.push(format!("    const char* (*{})(void);", field_name));
+                } else {
+                    fields.push(format!("    const char* {};", field_name));
+                }
+            }
+            ConfigNode::Null | ConfigNode::Env(_) => {
+                unreachable!("nulls and environment references are always typed")
             }
             ConfigNode::Value(v) => match v {
                 TomlValue::String(_) | TomlValue::Datetime(_) => {
@@ -91,8 +141,23 @@ fn format_c_init(map: &IndexMap<String, ConfigNode>, indent_level: usize, out: &
     for (k, node) in map {
         let field_name = sanitize_c_identifier(k);
         match node {
-            ConfigNode::Null => {
-                out.push_str(&format!("{}.{} = NULL,\n", indent, field_name));
+            ConfigNode::Typed(_, inner) => match leaf_of(inner) {
+                Some(Leaf::Env(r)) => out.push_str(&format!(
+                    "{}.{} = {},\n",
+                    indent,
+                    field_name,
+                    env_getter_name(&r.name)
+                )),
+                Some(Leaf::Value(v)) => out.push_str(&format!(
+                    "{}.{} = {},\n",
+                    indent,
+                    field_name,
+                    format_scalar_literal(v).unwrap_or_else(|| "NULL".to_string())
+                )),
+                _ => out.push_str(&format!("{}.{} = NULL,\n", indent, field_name)),
+            },
+            ConfigNode::Null | ConfigNode::Env(_) => {
+                unreachable!("nulls and environment references are always typed")
             }
             ConfigNode::Value(v) => match v {
                 TomlValue::Boolean(b) => {