From 1b212c88cb1976bf69cdaea8262c10e2ce479d87 Mon Sep 17 00:00:00 2001
From: Aram Hammoudeh <aram.devdocs@gmail.com>
Date: Sat, 20 Jun 2026 19:29:26 -0600
Subject: [PATCH] fix(codegen): prefer light token exports

---
 crates/plumb-codegen/src/ts_tokens.rs | 42 +++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/crates/plumb-codegen/src/ts_tokens.rs b/crates/plumb-codegen/src/ts_tokens.rs
index 2eae057..b003d0f 100644
--- a/crates/plumb-codegen/src/ts_tokens.rs
+++ b/crates/plumb-codegen/src/ts_tokens.rs
@@ -35,8 +35,9 @@ pub(crate) fn merge_literal_token_module(
 ) -> TokenModuleImport {
     let mut exports = Parser::new(contents).parse_exported_objects();
     exports.sort_by(|a, b| {
-        token_sort_key(&a.name)
-            .cmp(&token_sort_key(&b.name))
+        export_priority(&a.name)
+            .cmp(&export_priority(&b.name))
+            .then_with(|| token_sort_key(&a.name).cmp(&token_sort_key(&b.name)))
             .then_with(|| a.name.cmp(&b.name))
     });
 
@@ -66,6 +67,14 @@ pub(crate) fn merge_literal_token_module(
     import
 }
 
+fn export_priority(name: &str) -> u8 {
+    match token_sort_key(name).as_str() {
+        "light" | "default" | "tokens" | "designtokens" => 0,
+        "dark" => 2,
+        _ => 1,
+    }
+}
+
 #[derive(Debug)]
 struct ExportedObject {
     name: String,
@@ -854,6 +863,35 @@ mod tests {
         );
     }
 
+    #[test]
+    fn prefers_light_exports_before_dark_for_duplicate_color_keys() {
+        let source = r"
+            export const dark = {
+              background: '#000000',
+              primary: '#111111',
+              onlyDark: '#222222',
+            } as const;
+
+            export const light = {
+              background: '#ffffff',
+              primary: '#007068',
+            } as const;
+
+            export const otherColors = {
+              accent: '#123456',
+            } as const;
+        ";
+        let mut config = Config::default();
+
+        let import = merge_literal_token_module(&mut config, Path::new("tokens/colors.ts"), source);
+
+        assert_eq!(import.colors, 4);
+        assert_eq!(config.color.tokens["background"], "#ffffff");
+        assert_eq!(config.color.tokens["primary"], "#007068");
+        assert_eq!(config.color.tokens["accent"], "#123456");
+        assert_eq!(config.color.tokens["onlyDark"], "#222222");
+    }
+
     #[test]
     fn skips_unsupported_numeric_literals_without_truncating() {
         let source = r"