@webmate-studio/builder 0.2.88 → 0.2.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmate-studio/builder",
-  "version": "0.2.88",
+  "version": "0.2.90",
   "type": "module",
   "description": "Webmate Studio Component Builder",
   "keywords": [

package/src/css-deduplicator.js

@@ -66,7 +66,8 @@ export function deduplicateCSS(cssArray) {
 		base: new Set(),
 		properties: new Set(),
 		theme: new Set(),
-		utilities: new Set()
+		components: new Set(), // Component utilities (wrapped from utilities layer)
+		utilities: new Set()  // Design token utilities (should override components)
 	};
 	const regularRules = {
 		charset: [], // @charset declarations
@@ -157,6 +158,9 @@ export function deduplicateCSS(cssArray) {
 		parts.push(...regularRules.imports);
 	}
 
+	// Layer order declaration (MUST be first to define precedence)
+	parts.push('@layer base, components, utilities;');
+
 	// Tailwind layers in correct order
 	if (tailwindLayers.base.size > 0) {
 		parts.push(`@layer base {\n${Array.from(tailwindLayers.base).join('\n\n')}\n}`);
@@ -167,6 +171,11 @@ export function deduplicateCSS(cssArray) {
 	if (tailwindLayers.theme.size > 0) {
 		parts.push(`@layer theme {\n${Array.from(tailwindLayers.theme).join('\n\n')}\n}`);
 	}
+	if (tailwindLayers.components.size > 0) {
+		// Sort component utilities by breakpoint before joining
+		const sortedComponents = sortUtilityRules(Array.from(tailwindLayers.components));
+		parts.push(`@layer components {\n${sortedComponents.join('\n\n')}\n}`);
+	}
 	if (tailwindLayers.utilities.size > 0) {
 		// Sort utilities by breakpoint before joining
 		const sortedUtilities = sortUtilityRules(Array.from(tailwindLayers.utilities));

package/src/design-tokens.js

@@ -1010,10 +1010,8 @@ export function generateTailwindConfig(tokens) {
 export function generateCSSFromTokens(tokens) {
 	const lines = [];
 
-	// Define layer order FIRST (before any other CSS)
-	lines.push('/* CSS Layer Order Declaration */');
-	lines.push('@layer base, components, utilities;');
-	lines.push('');
+	// NOTE: @layer order declaration is now handled by css-deduplicator.js
+	// to ensure it appears only once and in the correct position
 	lines.push(':root {');
 
 	// Colors

package/src/tailwind-generator.js

@@ -68,6 +68,33 @@ function stripNonUtilityLayers(css) {
 	return css.trim();
 }
 
+/**
+ * Wraps utility classes in @layer components, preserving base/theme/properties layers
+ * This allows design token utilities (@layer utilities) to override component utilities
+ * @param {string} css - Full Tailwind CSS
+ * @returns {string} CSS with utilities wrapped in @layer components
+ */
+function wrapUtilitiesInComponentsLayer(css) {
+	// Extract @layer utilities content
+	const utilitiesMatch = css.match(/@layer\s+utilities\s*\{([\s\S]*?)\n\}/);
+
+	if (!utilitiesMatch) {
+		console.log('[Tailwind Generator] No @layer utilities found, returning CSS as-is');
+		return css;
+	}
+
+	const utilitiesContent = utilitiesMatch[1].trim();
+
+	// Replace @layer utilities with @layer components
+	const result = css.replace(
+		/@layer\s+utilities\s*\{[\s\S]*?\n\}/,
+		`@layer components {\n${utilitiesContent}\n}`
+	);
+
+	console.log('[Tailwind Generator] Wrapped utilities in @layer components');
+	return result;
+}
+
 /**
  * Extract Tailwind classes from HTML content
  * Supports: class="...", class='...', class={...}, and Svelte's class:xxx={...}
@@ -401,23 +428,25 @@ ${themeCSS}
 		let result = await compiler.build(classArray);
 
 		console.log(`[Tailwind Generator] includeBaseLayers = ${includeBaseLayers}`);
-		console.log(`[Tailwind Generator] Generated CSS length BEFORE processing: ${result.length}`);
+		console.log(`[Tailwind Generator] Generated CSS length: ${result.length}`);
 		console.log(`[Tailwind Generator] CSS contains @layer base: ${result.includes('@layer base')}`);
-		console.log(`[Tailwind Generator] CSS contains @layer theme: ${result.includes('@layer theme')}`);
+		console.log(`[Tailwind Generator] CSS contains @layer utilities: ${result.includes('@layer utilities')}`);
 
-		// If includeBaseLayers is false, strip out base/theme/properties layers
+		// If includeBaseLayers is false, strip out base/theme/properties layers and return unwrapped utilities
 		if (!includeBaseLayers) {
 			console.log('[Tailwind Generator] Stripping non-utility layers...');
 			result = stripNonUtilityLayers(result);
 			console.log(`[Tailwind Generator] Generated CSS length AFTER stripping: ${result.length}`);
-			console.log(`[Tailwind Generator] CSS contains @layer base: ${result.includes('@layer base')}`);
-		}
 
-		// ALWAYS wrap component CSS in @layer components
-		// This ensures utilities from design tokens (@layer utilities) can override them
-		// Even if base layers are included, component-specific CSS should be in @layer components
-		console.log('[Tailwind Generator] Wrapping in @layer components...');
-		result = `@layer components {\n${result}\n}`;
+			// Wrap stripped utilities in @layer components
+			result = `@layer components {\n${result}\n}`;
+			console.log('[Tailwind Generator] Wrapped stripped utilities in @layer components');
+		} else {
+			// Keep base/theme/properties layers, but wrap utilities in @layer components
+			// This preserves CSS custom properties while allowing utilities override
+			console.log('[Tailwind Generator] Preserving base/theme/properties, wrapping utilities in @layer components...');
+			result = wrapUtilitiesInComponentsLayer(result);
+		}
 
 		return result;