@ethlete/core 5.0.0-next.4 → 5.0.0-next.41

package/generators/{tailwind-4-theme → tailwind-4-color-theme}/generator.js

@@ -5,11 +5,15 @@ export default async function generate(tree, schema) {
     const themesPath = schema.themesPath || 'src/themes.ts';
     const outputPath = schema.outputPath || 'src/styles/generated-tailwind-themes.css';
     const prefix = schema.prefix || 'et';
+    // The runtime prefix drives the theme-swap CSS variables (--<runtimePrefix>-color-primary)
+    // and selectors (.<runtimePrefix>-color--<name>). It defaults to `prefix` so existing
+    // consumers who only ever passed one prefix see no change in output.
+    const runtimePrefix = schema.runtimePrefix || prefix;
     // Step 1: Check if themes file exists
     if (!tree.exists(themesPath)) {
         logger.error(`❌ Themes file not found at: ${themesPath}`);
         logger.log(`\nPlease specify the correct path using --themesPath option.`);
-        logger.log(`Example: nx g @ethlete/core:tailwind-4-theme --themesPath=src/app/themes.ts\n`);
+        logger.log(`Example: nx g @ethlete/core:tailwind-4-color-theme --themesPath=src/app/themes.ts\n`);
         return;
     }
     logger.log(`📁 Reading themes from: ${themesPath}`);
@@ -32,7 +36,21 @@ export default async function generate(tree, schema) {
         logger.log('  export const THEMES = [...] satisfies Theme[];\n');
         return;
     }
-    // Step 4: Validate theme configuration
+    // Step 4: Apply the generation-time default override, if any. The shared theme
+    // definitions may mark a default via isDefault, but in a monorepo each app picks its
+    // own default at its generation invocation - the option wins over the definitions.
+    if (schema.defaultTheme) {
+        try {
+            const defaultName = applyDefaultThemeOverride(themes, schema.defaultTheme);
+            logger.log(`🎯 Default theme set at generation time: ${defaultName}`);
+        }
+        catch (error) {
+            logger.error('❌ Invalid --defaultTheme option');
+            logger.error(`   ${error instanceof Error ? error.message : String(error)}`);
+            return;
+        }
+    }
+    // Step 5: Validate theme configuration
     try {
         validateThemeConfiguration(themes);
     }
@@ -41,17 +59,24 @@ export default async function generate(tree, schema) {
         logger.error(`   ${error instanceof Error ? error.message : String(error)}`);
         return;
     }
-    // Step 5: Generate Tailwind CSS
+    // Step 6: Generate Tailwind CSS
     logger.log('\n🎨 Generating Tailwind theme CSS...');
-    const css = generateTailwindThemeCss(themes, prefix, schema);
-    // Step 6: Write the generated CSS file
+    const css = generateTailwindThemeCss(themes, prefix, runtimePrefix, schema);
+    // Step 7: Write the generated CSS file
     const outputDir = outputPath.substring(0, outputPath.lastIndexOf('/'));
     if (outputDir && !tree.exists(outputDir)) {
         logger.log(`📁 Creating directory: ${outputDir}`);
     }
     tree.write(outputPath, css);
     logger.log(`✅ Generated Tailwind themes at: ${outputPath}`);
-    // Step 7: Try to find and update main styles file
+    // Step 8: Generate the `EthleteColorThemeNameRegistry` augmentation, so `etProvideColor`
+    // (and anything else that accepts a `RegisteredColorThemeName`) is checked/autocompleted
+    // against this app's actual theme names, instead of a plain `string`.
+    const typesOutputPath = schema.typesOutputPath || outputPath.replace(/\.css$/, '.d.ts');
+    const typesDts = generateColorThemeNameTypes(themes, schema);
+    tree.write(typesOutputPath, typesDts);
+    logger.log(`✅ Generated color theme name types at: ${typesOutputPath}`);
+    // Step 9: Try to find and update main styles file
     const mainStylesFiles = findMainStylesFile(tree);
     if (mainStylesFiles.length > 0) {
         logger.log('\n📝 Found potential main styles files:');
@@ -95,12 +120,9 @@ function extractThemesFromContent(content, filePath) {
     if (!initializer) {
         throw new Error('THEMES export has no initializer');
     }
-    // Handle 'satisfies' expression: [array] satisfies Type[]
-    if (initializer.isKind(SyntaxKind.SatisfiesExpression)) {
-        initializer = initializer.getExpression();
-    }
-    // Handle 'as const': [array] as const
-    if (initializer.isKind(SyntaxKind.AsExpression)) {
+    // Handle 'satisfies X'/'as const' wrappers, in either order: [array] satisfies Type[],
+    // [array] as const, or both combined.
+    while (initializer.isKind(SyntaxKind.SatisfiesExpression) || initializer.isKind(SyntaxKind.AsExpression)) {
         initializer = initializer.getExpression();
     }
     if (!initializer.isKind(SyntaxKind.ArrayLiteralExpression)) {
@@ -122,8 +144,9 @@ function extractThemesFromContent(content, filePath) {
                 logger.warn(`⚠️  Theme ${name} has no initializer`);
                 continue;
             }
-            // Handle 'as const' on individual theme objects
-            if (themeObj.isKind(SyntaxKind.AsExpression)) {
+            // Handle 'as const' and 'satisfies X' wrappers on individual theme objects, in
+            // either order (e.g. `{...} satisfies Theme`, `{...} as const`, or both combined).
+            while (themeObj.isKind(SyntaxKind.AsExpression) || themeObj.isKind(SyntaxKind.SatisfiesExpression)) {
                 themeObj = themeObj.getExpression();
             }
             if (!themeObj.isKind(SyntaxKind.ObjectLiteralExpression)) {
@@ -167,9 +190,9 @@ function parseThemeObject(obj, sourceFile) {
                     theme.isDefault = true;
                 }
                 break;
-            case 'isDefaultAlt':
-                if (initializer.isKind(SyntaxKind.TrueKeyword)) {
-                    theme.isDefaultAlt = true;
+            case 'type':
+                if (initializer.isKind(SyntaxKind.StringLiteral)) {
+                    theme.type = initializer.getLiteralValue();
                 }
                 break;
             case 'primary':
@@ -186,10 +209,21 @@ function parseThemeObject(obj, sourceFile) {
     }
     return theme;
 }
+// Makes the named theme the sole default, overriding any isDefault flags in the theme
+// definitions. Matches the theme's name or its CSS-safe form. Returns the resolved name.
+function applyDefaultThemeOverride(themes, defaultTheme) {
+    const wanted = createCssThemeName(defaultTheme);
+    const target = themes.find((t) => t.name === defaultTheme || createCssThemeName(t.name) === wanted);
+    if (!target) {
+        throw new Error(`No theme named "${defaultTheme}" found. Available themes: ${themes.map((t) => t.name).join(', ')}`);
+    }
+    for (const theme of themes) {
+        theme.isDefault = theme === target;
+    }
+    return target.name;
+}
 function validateThemeConfiguration(themes) {
     const defaultThemes = themes.filter((t) => t.isDefault);
-    const defaultAltThemes = themes.filter((t) => t.isDefaultAlt);
-    const bothDefaultAndAlt = themes.filter((t) => t.isDefault && t.isDefaultAlt);
     // Error: No default theme
     if (defaultThemes.length === 0) {
         throw new Error('No default theme found. At least one theme must have isDefault: true');
@@ -198,13 +232,20 @@ function validateThemeConfiguration(themes) {
     if (defaultThemes.length > 1) {
         throw new Error(`Multiple default themes found: ${defaultThemes.map((t) => t.name).join(', ')}. Only one theme can have isDefault: true`);
     }
-    // Error: Theme has both isDefault and isDefaultAlt
-    if (bothDefaultAndAlt.length > 0) {
-        throw new Error(`Theme "${bothDefaultAndAlt[0].name}" has both isDefault and isDefaultAlt set to true. A theme can only be one or the other`);
+    // Error: Duplicate theme types
+    const typeMap = new Map();
+    for (const theme of themes) {
+        if (!theme.type) {
+            continue;
+        }
+        const existing = typeMap.get(theme.type) || [];
+        existing.push(theme.name);
+        typeMap.set(theme.type, existing);
     }
-    // Error: Multiple default alt themes
-    if (defaultAltThemes.length > 1) {
-        throw new Error(`Multiple default alt themes found: ${defaultAltThemes.map((t) => t.name).join(', ')}. Only one theme can have isDefaultAlt: true`);
+    for (const [type, names] of typeMap) {
+        if (names.length > 1) {
+            throw new Error(`Multiple themes with type "${type}" found: ${names.join(', ')}. Only one theme can have a given type`);
+        }
     }
 }
 function parseThemeSwatch(obj, sourceFile) {
@@ -219,11 +260,18 @@ function parseThemeSwatch(obj, sourceFile) {
         if (!initializer) {
             continue;
         }
-        if (propName === 'color' || propName === 'onColor') {
-            const colorMap = parseColorMap(initializer, sourceFile);
-            if (colorMap) {
-                swatch[propName] = colorMap;
-            }
+        const colorMap = parseColorMap(initializer, sourceFile);
+        if (!colorMap) {
+            continue;
+        }
+        if (propName === 'color') {
+            swatch.color = colorMap;
+        }
+        else if (propName === 'onColor') {
+            swatch.onColor = colorMap;
+        }
+        else if (propName === 'inkColor') {
+            swatch.inkColor = colorMap;
         }
     }
     if (!swatch.color || !swatch.onColor) {
@@ -231,6 +279,8 @@ function parseThemeSwatch(obj, sourceFile) {
     }
     return swatch;
 }
+const COLOR_MAP_KEYS = ['default', 'hover', 'focus', 'active', 'disabled'];
+const isColorMapKey = (name) => COLOR_MAP_KEYS.some((key) => key === name);
 function parseColorMap(initializer, sourceFile) {
     // Handle spread expressions by resolving references
     if (initializer.isKind(SyntaxKind.ObjectLiteralExpression)) {
@@ -240,7 +290,7 @@ function parseColorMap(initializer, sourceFile) {
             if (prop.isKind(SyntaxKind.PropertyAssignment)) {
                 const propName = prop.getName();
                 const propValue = prop.getInitializer();
-                if (propValue?.isKind(SyntaxKind.StringLiteral)) {
+                if (propValue?.isKind(SyntaxKind.StringLiteral) && isColorMapKey(propName)) {
                     colorMap[propName] = propValue.getLiteralValue();
                 }
             }
@@ -249,9 +299,7 @@ function parseColorMap(initializer, sourceFile) {
                 const spreadExpr = prop.getExpression();
                 if (spreadExpr.isKind(SyntaxKind.Identifier)) {
                     const referencedName = spreadExpr.getText();
-                    const referencedDecl = sourceFile
-                        .getVariableDeclarations()
-                        .find((decl) => decl.getName() === referencedName);
+                    const referencedDecl = sourceFile.getVariableDeclarations().find((decl) => decl.getName() === referencedName);
                     if (referencedDecl) {
                         const referencedObj = referencedDecl.getInitializer();
                         if (referencedObj?.isKind(SyntaxKind.ObjectLiteralExpression)) {
@@ -265,19 +313,19 @@ function parseColorMap(initializer, sourceFile) {
             }
         }
         // Apply fallbacks for required fields
-        if (colorMap.default) {
+        const defaultColor = colorMap.default;
+        if (defaultColor) {
             // Check if this is a ThemeColorMap (has hover, active, or disabled explicitly set)
             const isThemeColorMap = colorMap.hover !== undefined || colorMap.active !== undefined || colorMap.disabled !== undefined;
             if (isThemeColorMap) {
                 // For ThemeColorMap - apply fallbacks for all required fields
-                const defaultColor = colorMap.default;
-                const hoverColor = (colorMap.hover || defaultColor);
+                const hoverColor = colorMap.hover || defaultColor;
                 const result = {
                     default: defaultColor,
                     hover: hoverColor,
                     focus: colorMap.focus,
-                    active: (colorMap.active || hoverColor),
-                    disabled: (colorMap.disabled || defaultColor),
+                    active: colorMap.active || hoverColor,
+                    disabled: colorMap.disabled || defaultColor,
                 };
                 return result;
             }
@@ -295,132 +343,182 @@ function createCssThemeName(name) {
         .replace(/\s+/g, '-')
         .replace(/[^a-z0-9-]/g, '');
 }
-function generateTailwindThemeCss(themes, prefix, schema) {
+function generateColorThemeNameTypes(themes, schema) {
+    const themesPath = schema.themesPath || 'src/themes.ts';
+    const outputPath = schema.outputPath || 'src/styles/generated-tailwind-themes.css';
+    const typesOutputPath = schema.typesOutputPath || outputPath.replace(/\.css$/, '.d.ts');
+    const names = themes.map((theme) => `'${theme.name}'`).join(' | ');
+    return `/*
+ * Auto-generated by @ethlete/core:tailwind-4-color-theme
+ * DO NOT EDIT THIS FILE MANUALLY
+ *
+ * Regenerate by running:
+ * nx g @ethlete/core:tailwind-4-color-theme --themesPath=${themesPath}${schema.outputPath ? ` --outputPath=${outputPath}` : ''}${schema.typesOutputPath ? ` --typesOutputPath=${typesOutputPath}` : ''}${schema.prefix && schema.prefix !== 'et' ? ` --prefix=${schema.prefix}` : ''}${schema.runtimePrefix && schema.runtimePrefix !== schema.prefix ? ` --runtimePrefix=${schema.runtimePrefix}` : ''}${schema.defaultTheme ? ` --defaultTheme=${schema.defaultTheme}` : ''}
+ */
+
+declare module '@ethlete/core' {
+  interface EthleteColorThemeNameRegistry {
+    name: ${names};
+  }
+}
+
+export {};
+`;
+}
+function generateTailwindThemeCss(themes, utilityPrefix, runtimePrefix, schema) {
     const tailwindVars = [];
     const themeVars = [];
     const themesPath = schema.themesPath || 'src/themes.ts';
     const outputPath = schema.outputPath || 'src/styles/generated-tailwind-themes.css';
-    const header = `/* 
+    const header = `/*
  * Auto-generated Tailwind 4 theme colors from @ethlete/core
  * DO NOT EDIT THIS FILE MANUALLY
- * 
+ *
  * Generated from your theme definitions
  * This file can be regenerated by running:
- * nx g @ethlete/core:tailwind-4-theme --themesPath=${themesPath}${schema.outputPath ? ` --outputPath=${outputPath}` : ''}${schema.prefix && schema.prefix !== 'et' ? ` --prefix=${schema.prefix}` : ''}
+ * nx g @ethlete/core:tailwind-4-color-theme --themesPath=${themesPath}${schema.outputPath ? ` --outputPath=${outputPath}` : ''}${schema.prefix && schema.prefix !== 'et' ? ` --prefix=${schema.prefix}` : ''}${schema.runtimePrefix && schema.runtimePrefix !== utilityPrefix ? ` --runtimePrefix=${schema.runtimePrefix}` : ''}${schema.defaultTheme ? ` --defaultTheme=${schema.defaultTheme}` : ''}
  */
 
 `;
     // Validation is now done separately before this function is called
     const defaultThemes = themes.filter((t) => t.isDefault);
-    const defaultAltThemes = themes.filter((t) => t.isDefaultAlt);
-    const regularThemes = themes.filter((t) => !t.isDefault && !t.isDefaultAlt);
+    const regularThemes = themes.filter((t) => !t.isDefault);
     // Generate static Tailwind @theme block for each theme
     for (const theme of themes) {
         const name = createCssThemeName(theme.name);
         // Add comment for theme section
         tailwindVars.push(`  /* ${theme.name} theme */`);
         // Primary colors for Tailwind utilities
-        addTailwindColorVariants(tailwindVars, `${prefix}-${name}`, theme.primary.color);
+        addTailwindColorVariants(tailwindVars, `${utilityPrefix}-${name}`, theme.primary.color);
         tailwindVars.push('');
         // On colors for Tailwind utilities
-        addTailwindColorVariants(tailwindVars, `${prefix}-on-${name}`, theme.primary.onColor);
+        addTailwindColorVariants(tailwindVars, `${utilityPrefix}-on-${name}`, theme.primary.onColor);
+        tailwindVars.push('');
+        // Ink colors for standalone foreground usage
+        addTailwindColorVariants(tailwindVars, `${utilityPrefix}-${name}-ink`, theme.primary.inkColor || theme.primary.color);
         tailwindVars.push('');
         // Secondary colors if present
         if (theme.secondary) {
-            addTailwindColorVariants(tailwindVars, `${prefix}-${name}-secondary`, theme.secondary.color);
+            addTailwindColorVariants(tailwindVars, `${utilityPrefix}-${name}-secondary`, theme.secondary.color);
             tailwindVars.push('');
-            addTailwindColorVariants(tailwindVars, `${prefix}-on-${name}-secondary`, theme.secondary.onColor);
+            addTailwindColorVariants(tailwindVars, `${utilityPrefix}-on-${name}-secondary`, theme.secondary.onColor);
             tailwindVars.push('');
         }
         // Tertiary colors if present
         if (theme.tertiary) {
-            addTailwindColorVariants(tailwindVars, `${prefix}-${name}-tertiary`, theme.tertiary.color);
+            addTailwindColorVariants(tailwindVars, `${utilityPrefix}-${name}-tertiary`, theme.tertiary.color);
             tailwindVars.push('');
-            addTailwindColorVariants(tailwindVars, `${prefix}-on-${name}-tertiary`, theme.tertiary.onColor);
+            addTailwindColorVariants(tailwindVars, `${utilityPrefix}-on-${name}-tertiary`, theme.tertiary.onColor);
             tailwindVars.push('');
         }
     }
     tailwindVars.push('');
-    // Generate dynamic theme variables - check main themes and alt themes separately
+    // Main theme dynamic colors
     const mainThemes = [...defaultThemes, ...regularThemes];
     const hasSecondary = mainThemes.some((t) => t.secondary);
     const hasTertiary = mainThemes.some((t) => t.tertiary);
-    const hasAltSecondary = defaultAltThemes.some((t) => t.secondary);
-    const hasAltTertiary = defaultAltThemes.some((t) => t.tertiary);
-    // Main theme dynamic colors
-    tailwindVars.push('  /* Dynamic theme colors (references runtime CSS variables) */');
-    addDynamicThemeColors(tailwindVars, prefix, 'theme', 'primary', true);
+    // Collect the dynamic theme colors once. They are emitted in `@theme` (so Tailwind generates
+    // the utilities) and ALSO re-declared on every color selector in the alias block below. A
+    // Tailwind `@theme` variable only lands on `:root`, so `rgb(var(--<runtime>-color-*))` resolves
+    // once against the root color scope and inherits that concrete color into descendants - which
+    // means `bg-<prefix>-theme-*` utilities would ignore nested `.<runtime>-color--*` scopes.
+    // Re-declaring them per color selector makes the utilities resolve against the nearest scope.
+    const dynamicColorVars = [];
+    addDynamicThemeColors(dynamicColorVars, utilityPrefix, runtimePrefix, 'theme', 'primary', false);
+    addDynamicInkColors(dynamicColorVars, utilityPrefix, runtimePrefix, 'theme-ink', 'primary-ink');
     if (hasSecondary) {
-        addDynamicThemeColors(tailwindVars, prefix, 'theme-secondary', 'secondary', false);
+        addDynamicThemeColors(dynamicColorVars, utilityPrefix, runtimePrefix, 'theme-secondary', 'secondary', false);
     }
     if (hasTertiary) {
-        addDynamicThemeColors(tailwindVars, prefix, 'theme-tertiary', 'tertiary', false);
-    }
-    // Alt theme dynamic colors
-    tailwindVars.push('  /* Alt theme dynamic colors */');
-    addDynamicThemeColors(tailwindVars, prefix, 'alt-theme', 'alt-primary', true);
-    if (hasAltSecondary) {
-        addDynamicThemeColors(tailwindVars, prefix, 'alt-theme-secondary', 'alt-secondary', false);
-    }
-    if (hasAltTertiary) {
-        addDynamicThemeColors(tailwindVars, prefix, 'alt-theme-tertiary', 'alt-tertiary', false);
+        addDynamicThemeColors(dynamicColorVars, utilityPrefix, runtimePrefix, 'theme-tertiary', 'tertiary', false);
     }
-    // Generate runtime CSS for ALL themes (both main and alt variants)
+    tailwindVars.push('  /* Dynamic theme colors (references runtime CSS variables) */');
+    tailwindVars.push(...dynamicColorVars);
+    // Generate runtime CSS for all themes
     themes.forEach((theme) => {
         const name = createCssThemeName(theme.name);
-        // Determine if this is the default or default-alt theme
+        // Determine if this is the default theme
         const isDefault = theme.isDefault;
-        const isDefaultAlt = theme.isDefaultAlt;
-        // Generate main theme variant (.et-theme--{name})
+        // Generate color variant (.<runtimePrefix>-color--{name})
         if (isDefault) {
-            // Default theme gets :root and .et-theme--default selectors
-            const selectors = [':root', `.${prefix}-theme--default`, `.${prefix}-theme--${name}`];
-            themeVars.push(`${selectors.join(', ')} {`);
-        }
-        else if (!isDefaultAlt) {
-            // Regular themes just get their own class
-            themeVars.push(`.${prefix}-theme--${name} {`);
-        }
-        if (isDefault || !isDefaultAlt) {
-            addThemeColorVariants(themeVars, prefix, '', theme);
-            themeVars.push('}\n');
-        }
-        // Generate alt theme variant (.et-theme-alt--{name})
-        if (isDefaultAlt) {
-            // Default alt theme gets :root and .et-theme-alt--default selectors
-            const selectors = [':root', `.${prefix}-theme-alt--default`, `.${prefix}-theme-alt--${name}`];
+            // Default color gets :root and .<runtimePrefix>-color--default selectors
+            const selectors = [':root', `.${runtimePrefix}-color--default`, `.${runtimePrefix}-color--${name}`];
             themeVars.push(`${selectors.join(', ')} {`);
         }
         else {
-            // All themes (including default and regular) get an alt variant
-            themeVars.push(`.${prefix}-theme-alt--${name} {`);
+            // Regular colors just get their own class
+            themeVars.push(`.${runtimePrefix}-color--${name} {`);
         }
-        addThemeColorVariants(themeVars, prefix, 'alt-', theme);
+        addThemeColorVariants(themeVars, runtimePrefix, '', theme);
         themeVars.push('}\n');
     });
+    // Re-indent the dynamic theme colors (from 2-space `@theme` indent to the 4-space alias-block
+    // indent) and drop trailing blank lines so they slot cleanly into the alias selector below.
+    const dynamicColorAliasLines = dynamicColorVars.map((line) => (line === '' ? '' : `  ${line}`));
+    while (dynamicColorAliasLines.length && dynamicColorAliasLines[dynamicColorAliasLines.length - 1] === '') {
+        dynamicColorAliasLines.pop();
+    }
+    // Convenience var aliases - available on any element with a color class (or root for default)
+    const aliasBlock = `/* Convenience aliases (rgb + solid + opacity variants) */
+@layer base {
+  :root, :where([class*="${runtimePrefix}-color--"]) {
+    --${runtimePrefix}-theme-color-primary-rgb: var(--${runtimePrefix}-color-primary);
+    --${runtimePrefix}-theme-color-primary-opacity: 1;
+    --${runtimePrefix}-theme-color-primary-solid: rgb(var(--${runtimePrefix}-theme-color-primary-rgb));
+    --${runtimePrefix}-theme-color-primary: rgb(var(--${runtimePrefix}-theme-color-primary-rgb) / var(--${runtimePrefix}-theme-color-primary-opacity));
+
+    --${runtimePrefix}-theme-color-on-primary-rgb: var(--${runtimePrefix}-color-on-primary);
+    --${runtimePrefix}-theme-color-on-primary-opacity: 1;
+    --${runtimePrefix}-theme-color-on-primary-solid: rgb(var(--${runtimePrefix}-theme-color-on-primary-rgb) / var(--${runtimePrefix}-theme-color-on-primary-opacity));
+    --${runtimePrefix}-theme-color-on-primary: rgb(var(--${runtimePrefix}-theme-color-on-primary-rgb) / var(--${runtimePrefix}-theme-color-on-primary-opacity));
+
+    --${runtimePrefix}-theme-color-ink-rgb: var(--${runtimePrefix}-color-primary-ink, var(--${runtimePrefix}-color-primary));
+    --${runtimePrefix}-theme-color-ink-opacity: 1;
+    --${runtimePrefix}-theme-color-ink-solid: rgb(var(--${runtimePrefix}-theme-color-ink-rgb) / var(--${runtimePrefix}-theme-color-ink-opacity));
+    --${runtimePrefix}-theme-color-ink: rgb(var(--${runtimePrefix}-theme-color-ink-rgb) / var(--${runtimePrefix}-theme-color-ink-opacity));
+
+    /* Dynamic Tailwind theme colors - re-declared per color scope so that
+       bg-${utilityPrefix}-theme-* utilities resolve against the nearest .${runtimePrefix}-color--*
+       scope instead of the value computed once at :root. */
+${dynamicColorAliasLines.join('\n')}
+  }
+}
+`;
     return `${header}@theme {
 ${tailwindVars.join('\n')}
 }
 
-${themeVars.join('\n')}`;
+@layer base {
+${themeVars.join('\n')}
+}
+
+${aliasBlock}`;
 }
-function addDynamicThemeColors(vars, prefix, tailwindName, cssVarName, addSpacingBefore) {
+function addDynamicThemeColors(vars, utilityPrefix, runtimePrefix, tailwindName, cssVarName, addSpacingBefore) {
     if (addSpacingBefore && vars.length > 0 && vars[vars.length - 1] !== '') {
         vars.push('');
     }
     // Color variants
-    vars.push(`  --color-${prefix}-${tailwindName}: rgb(var(--${prefix}-color-${cssVarName}));`);
-    vars.push(`  --color-${prefix}-${tailwindName}-hover: rgb(var(--${prefix}-color-${cssVarName}-hover));`);
-    vars.push(`  --color-${prefix}-${tailwindName}-focus: rgb(var(--${prefix}-color-${cssVarName}-focus));`);
-    vars.push(`  --color-${prefix}-${tailwindName}-active: rgb(var(--${prefix}-color-${cssVarName}-active));`);
-    vars.push(`  --color-${prefix}-${tailwindName}-disabled: rgb(var(--${prefix}-color-${cssVarName}-disabled));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}: rgb(var(--${runtimePrefix}-color-${cssVarName}));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-hover: rgb(var(--${runtimePrefix}-color-${cssVarName}-hover));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-focus: rgb(var(--${runtimePrefix}-color-${cssVarName}-focus));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-active: rgb(var(--${runtimePrefix}-color-${cssVarName}-active));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-disabled: rgb(var(--${runtimePrefix}-color-${cssVarName}-disabled));`);
     vars.push('');
     // On-color variants
-    vars.push(`  --color-${prefix}-on-${tailwindName}: rgb(var(--${prefix}-color-on-${cssVarName}));`);
-    vars.push(`  --color-${prefix}-on-${tailwindName}-hover: rgb(var(--${prefix}-color-on-${cssVarName}-hover));`);
-    vars.push(`  --color-${prefix}-on-${tailwindName}-focus: rgb(var(--${prefix}-color-on-${cssVarName}-focus));`);
-    vars.push(`  --color-${prefix}-on-${tailwindName}-active: rgb(var(--${prefix}-color-on-${cssVarName}-active));`);
-    vars.push(`  --color-${prefix}-on-${tailwindName}-disabled: rgb(var(--${prefix}-color-on-${cssVarName}-disabled));`);
+    vars.push(`  --color-${utilityPrefix}-on-${tailwindName}: rgb(var(--${runtimePrefix}-color-on-${cssVarName}));`);
+    vars.push(`  --color-${utilityPrefix}-on-${tailwindName}-hover: rgb(var(--${runtimePrefix}-color-on-${cssVarName}-hover));`);
+    vars.push(`  --color-${utilityPrefix}-on-${tailwindName}-focus: rgb(var(--${runtimePrefix}-color-on-${cssVarName}-focus));`);
+    vars.push(`  --color-${utilityPrefix}-on-${tailwindName}-active: rgb(var(--${runtimePrefix}-color-on-${cssVarName}-active));`);
+    vars.push(`  --color-${utilityPrefix}-on-${tailwindName}-disabled: rgb(var(--${runtimePrefix}-color-on-${cssVarName}-disabled));`);
+    vars.push('');
+}
+function addDynamicInkColors(vars, utilityPrefix, runtimePrefix, tailwindName, cssVarName) {
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}: rgb(var(--${runtimePrefix}-color-${cssVarName}));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-hover: rgb(var(--${runtimePrefix}-color-${cssVarName}-hover));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-focus: rgb(var(--${runtimePrefix}-color-${cssVarName}-focus));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-active: rgb(var(--${runtimePrefix}-color-${cssVarName}-active));`);
+    vars.push(`  --color-${utilityPrefix}-${tailwindName}-disabled: rgb(var(--${runtimePrefix}-color-${cssVarName}-disabled));`);
     vars.push('');
 }
 function addTailwindColorVariants(vars, colorName, colorSet) {
@@ -465,6 +563,17 @@ function addThemeColorVariants(vars, prefix, altPrefix, theme) {
         vars.push(`  --${prefix}-color-${altPrefix}on-${level}-focus: ${onFocusColor};`);
         vars.push(`  --${prefix}-color-${altPrefix}on-${level}-active: ${onActiveColor};`);
         vars.push(`  --${prefix}-color-${altPrefix}on-${level}-disabled: ${onDisabledColor};`);
+        const inkDefaultColor = swatch.inkColor?.default || defaultColor;
+        const inkHoverColor = swatch.inkColor?.hover || inkDefaultColor;
+        const inkFocusColor = swatch.inkColor?.focus || inkHoverColor;
+        const inkActiveColor = swatch.inkColor?.active || inkDefaultColor;
+        const inkDisabledColor = swatch.inkColor?.disabled || inkDefaultColor;
+        vars.push('');
+        vars.push(`  --${prefix}-color-${altPrefix}${level}-ink: ${inkDefaultColor};`);
+        vars.push(`  --${prefix}-color-${altPrefix}${level}-ink-hover: ${inkHoverColor};`);
+        vars.push(`  --${prefix}-color-${altPrefix}${level}-ink-focus: ${inkFocusColor};`);
+        vars.push(`  --${prefix}-color-${altPrefix}${level}-ink-active: ${inkActiveColor};`);
+        vars.push(`  --${prefix}-color-${altPrefix}${level}-ink-disabled: ${inkDisabledColor};`);
         if (theme.secondary || theme.tertiary) {
             vars.push('');
         }

package/generators/tailwind-4-color-theme/schema.json

@@ -0,0 +1,44 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "tailwind-4-color-theme",
+  "title": "Tailwind 4 Theming Generator",
+  "description": "Generates Tailwind 4 compatible CSS from your Ethlete theme definitions",
+  "type": "object",
+  "properties": {
+    "themesPath": {
+      "type": "string",
+      "description": "Path to your themes file (relative to workspace root)",
+      "default": "src/themes.ts",
+      "x-prompt": "Where is your themes file located?"
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "Where to output the generated Tailwind themes CSS",
+      "default": "src/styles/generated-tailwind-themes.css",
+      "x-prompt": "Where should the generated CSS be saved?"
+    },
+    "typesOutputPath": {
+      "type": "string",
+      "description": "Where to output the generated `EthleteColorThemeNameRegistry` augmentation (a .d.ts that narrows `etProvideColor` and other theme-name APIs to your actual theme names). Defaults to `outputPath` with its extension swapped to `.d.ts`."
+    },
+    "prefix": {
+      "type": "string",
+      "description": "Prefix for Tailwind utility color variable names (e.g., 'et' creates --color-et-primary, usable as bg-et-primary)",
+      "default": "et"
+    },
+    "runtimePrefix": {
+      "type": "string",
+      "description": "Prefix for the runtime theme-swap mechanism: the CSS custom properties (--<runtimePrefix>-color-primary) and selectors (.<runtimePrefix>-color--<name>) that ProvideColorDirective (etProvideColor) toggles between. Defaults to the same value as 'prefix'. Set this separately when your Tailwind utility prefix needs to differ from your runtime theme-switching prefix (e.g. because '--color-primary' is already a documented public API elsewhere in your app)."
+    },
+    "defaultTheme": {
+      "type": "string",
+      "description": "Name of the theme to use as the default, overriding any isDefault flags in the theme definitions. Use this when multiple apps share one theme definition set (e.g. in a monorepo) but each app needs a different default."
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Skip formatting files after generation",
+      "default": false
+    }
+  },
+  "required": ["themesPath"]
+}