make fokus.dev test work after massive rebase

Author: bartveneman

src/index.js

@@ -33,12 +33,21 @@ export function layer_tree_from_ast(ast) {
 			if (node.type !== NODE_AT_RULE) return
 
 			if (node.name === 'layer') {
-				if (node.has_prelude) {
-					let has_block = node.has_children && node.children.some((c) => c.type !== NODE_PRELUDE_LAYER_NAME)
-					if (!has_block) {
-						for (let child of node.children) {
-							if (child.type === NODE_PRELUDE_LAYER_NAME) {
-								root.add_child(current_stack, child.text, create_location(node))
+				if (node.prelude !== null) {
+					let groups = node.prelude.split(',').map((s) => s.trim())
+					if (!node.has_block) {
+						for (let name of groups) {
+							let parts = get_layer_names(name)
+							// Ensure all parent layers exist and add them to the tree
+							for (let i = 0; i < parts.length; i++) {
+								let path = parts.slice(0, i)
+								let layer_name = parts[i]
+								if (layer_name) {
+									// Only add location to the final layer in dotted notation
+									// Create a new copy to avoid sharing references
+									let loc = i === parts.length - 1 ? create_location(node) : undefined
+									root.add_child(path, layer_name, loc)
+								}
 							}
 						}
 					} else {

test/global.spec.js

@@ -58,7 +58,7 @@ test('mixed imports and layers', () => {
 		{
 			name: '__anonymous-2__',
 			is_anonymous: true,
-			locations: [{ line: 10, column: 3, start: 176, end: 185 }],
+			locations: [{ line: 10, column: 3, start: 176 }],
 			children: [],
 		},
 	]
@@ -76,70 +76,70 @@ test('the fokus.dev boilerplate', () => {
 		{
 			name: 'core',
 			is_anonymous: false,
-			locations: [{ line: 2, column: 3, start: 3, end: 49 }],
+			locations: [{ line: 2, column: 3, start: 3 }],
 			children: [
 				{
 					name: 'reset',
 					is_anonymous: false,
-					locations: [{ line: 3, column: 3, start: 52, end: 94 }],
+					locations: [{ line: 3, column: 3, start: 52 }],
 					children: [],
 				},
 				{
 					name: 'tokens',
 					is_anonymous: false,
-					locations: [{ line: 3, column: 3, start: 52, end: 94 }],
+					locations: [{ line: 3, column: 3, start: 52 }],
 					children: [],
 				},
 				{
 					name: 'base',
 					is_anonymous: false,
-					locations: [{ line: 3, column: 3, start: 52, end: 94 }],
+					locations: [{ line: 3, column: 3, start: 52 }],
 					children: [],
 				},
 			],
 		},
 		{
 			name: 'third-party',
 			is_anonymous: false,
-			locations: [{ line: 2, column: 3, start: 3, end: 49 }],
+			locations: [{ line: 2, column: 3, start: 3 }],
 			children: [
 				{
 					name: 'imports',
 					is_anonymous: false,
-					locations: [{ line: 4, column: 3, start: 97, end: 147 }],
+					locations: [{ line: 4, column: 3, start: 97 }],
 					children: [],
 				},
 				{
 					name: 'overrides',
 					is_anonymous: false,
-					locations: [{ line: 4, column: 3, start: 97, end: 147 }],
+					locations: [{ line: 4, column: 3, start: 97 }],
 					children: [],
 				},
 			],
 		},
 		{
 			name: 'components',
 			is_anonymous: false,
-			locations: [{ line: 2, column: 3, start: 3, end: 49 }],
+			locations: [{ line: 2, column: 3, start: 3 }],
 			children: [
 				{
 					name: 'base',
 					is_anonymous: false,
-					locations: [{ line: 5, column: 3, start: 150, end: 196 }],
+					locations: [{ line: 5, column: 3, start: 150 }],
 					children: [],
 				},
 				{
 					name: 'variations',
 					is_anonymous: false,
-					locations: [{ line: 5, column: 3, start: 150, end: 196 }],
+					locations: [{ line: 5, column: 3, start: 150 }],
 					children: [],
 				},
 			],
 		},
 		{
 			name: 'utility',
 			is_anonymous: false,
-			locations: [{ line: 2, column: 3, start: 3, end: 49 }],
+			locations: [{ line: 2, column: 3, start: 3 }],
 			children: [],
 		},
 	]