fix tests, types and exported name

Author: bartveneman

README.md

@@ -59,6 +59,11 @@ This example would result in this `tree`:
 			},
 		],
 	},
+	{
+		name: '__anonymous-2__',
+		locations: [{ line: 10, column: 3, start: 176, end: 185 }],
+		children: [],
+	},
 ]
 ```
 

index.d.ts

@@ -13,5 +13,5 @@ export type TreeNode = {
 	locations: Location[];
 }
 
-export function get_tree_from_ast(ast: CssNode): TreeNode['children'];
-export function get_tree(css: string): TreeNode['children'];
+export function layer_tree_from_ast(ast: CssNode): TreeNode[];
+export function layer_tree(css: string): TreeNode[];

package.json

@@ -4,7 +4,7 @@
   "description": "Discover the composition of your CSS @layers",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/projectwallace/css-layers.git"
+    "url": "git+https://github.com/projectwallace/css-layer-tree.git"
   },
   "homepage": "https://github.com/projectwallace/css-layer-tree",
   "issues": "https://github.com/projectwallace/css-layer-tree/issues",

src/TreeNode.js

@@ -7,7 +7,7 @@ export class TreeNode {
 		/** @type {Map<string, TreeNode<T>>} */
 		this.children = new Map()
 		/** @type {T[]} */
-		this.locations = [] // Store metadata for each location added
+		this.locations = []
 	}
 
 	/**
@@ -53,8 +53,7 @@ export class TreeNode {
 			name: this.name,
 			locations: this.locations,
 			children: Array
-				.from(this.children.values())
-				.map((child) => child.to_plain_object()),
+				.from(this.children.values(), (child) => child.to_plain_object())
 		}
 	}
 }

src/index.js

@@ -29,10 +29,22 @@ function is_layer(node) {
 	return node.name.toLowerCase() === 'layer'
 }
 
+/**
+ * @param {import('css-tree').AtrulePrelude} prelude
+ * @returns {string[]}
+ */
+function get_layer_names(prelude) {
+	return csstree
+		// @todo: fewer loops plz
+		.generate(prelude)
+		.split('.')
+		.map((s) => s.trim())
+}
+
 /**
  * @param {import('css-tree').CssNode} ast
  */
-export function get_tree_from_ast(ast) {
+export function layer_tree_from_ast(ast) {
 	/** @type {string[]} */
 	let current_stack = []
 	let root = new TreeNode('root')
@@ -44,18 +56,6 @@ export function get_tree_from_ast(ast) {
 		return `__anonymous-${anonymous_counter}__`
 	}
 
-	/**
-	 * @param {import('css-tree').AtrulePrelude} prelude
-	 * @returns {string[]}
-	 */
-	function get_layer_names(prelude) {
-		return csstree
-			// @todo: fewer loops plz
-			.generate(prelude)
-			.split('.')
-			.map((s) => s.trim())
-	}
-
 	csstree.walk(ast, {
 		visit: 'Atrule',
 		enter(node) {
@@ -66,10 +66,7 @@ export function get_tree_from_ast(ast) {
 					let layer_name = get_anonymous_id()
 					root.add_child(current_stack, layer_name, location)
 					current_stack.push(layer_name)
-					return
-				}
-
-				if (node.prelude.type === 'AtrulePrelude') {
+				} else if (node.prelude.type === 'AtrulePrelude') {
 					if (node.block === null) {
 						// @ts-expect-error CSSTree types are not updated yet in @types/css-tree
 						let prelude = csstree.findAll(node.prelude, n => n.type === 'Layer').map(n => n.name)
@@ -140,7 +137,7 @@ export function get_tree_from_ast(ast) {
 /**
  * @param {string} css
  */
-export function get_tree(css) {
+export function layer_tree(css) {
 	let ast = csstree.parse(css, {
 		positions: true,
 		parseAtrulePrelude: true,
@@ -149,5 +146,5 @@ export function get_tree(css) {
 		parseCustomProperty: false,
 	})
 
-	return get_tree_from_ast(ast)
+	return layer_tree_from_ast(ast)
 }

test/global.spec.js

@@ -1,24 +1,24 @@
 import { test } from 'uvu'
 import * as assert from 'uvu/assert'
-import { get_tree } from '../src/index.js'
+import { layer_tree } from '../src/index.js'
 
 test('handles empty input', () => {
-	assert.equal(get_tree(''), [])
+	assert.equal(layer_tree(''), [])
 })
 
 test('handles CSS without layers', () => {
-	assert.equal(get_tree('@media all { body { color: red; } }'), [])
+	assert.equal(layer_tree('@media all { body { color: red; } }'), [])
 })
 
 test('mixed imports and layers', () => {
-	let actual = get_tree(`
+	let actual = layer_tree(`
 		@import url("test.css") layer;
 		@import url("test.css") LAYER(test);
 		@layer anotherTest {
 			@layer moreTest {
 				@layer deepTest {}
 			}
-		};
+		}
 		/* anonymous @layer */
 		@layer {}
 	`)
@@ -49,6 +49,11 @@ test('mixed imports and layers', () => {
 					]
 				}
 			]
+		},
+		{
+			name: '__anonymous-2__',
+			locations: [{ line: 10, column: 3, start: 176, end: 185 }],
+			children: []
 		}
 	]
 	assert.equal(actual, expected)

test/import.spec.js

@@ -1,9 +1,9 @@
 import { test } from 'uvu'
 import * as assert from 'uvu/assert'
-import { get_tree } from '../src/index.js'
+import { layer_tree } from '../src/index.js'
 
 test('@import url() layer', () => {
-	let actual = get_tree('@import url("foo.css") layer;')
+	let actual = layer_tree('@import url("foo.css") layer;')
 	let expected = [{
 		name: '__anonymous-1__',
 		locations: [{ line: 1, column: 1, start: 0, end: 29 }],
@@ -13,7 +13,7 @@ test('@import url() layer', () => {
 })
 
 test('@import url() LAYER', () => {
-	let actual = get_tree('@import url("foo.css") LAYER;')
+	let actual = layer_tree('@import url("foo.css") LAYER;')
 	let expected = [{
 		"name": "__anonymous-1__",
 		locations: [{ line: 1, column: 1, start: 0, end: 29 }],
@@ -23,7 +23,7 @@ test('@import url() LAYER', () => {
 })
 
 test('@import url() layer()', () => {
-	let actual = get_tree('@import url("foo.css") layer();')
+	let actual = layer_tree('@import url("foo.css") layer();')
 	let expected = [{
 		name: '__anonymous-1__',
 		locations: [{ line: 1, column: 1, start: 0, end: 31 }],
@@ -33,7 +33,7 @@ test('@import url() layer()', () => {
 })
 
 test('@import url() LAYER()', () => {
-	let actual = get_tree('@import url("foo.css") LAYER();')
+	let actual = layer_tree('@import url("foo.css") LAYER();')
 	let expected = [{
 		name: '__anonymous-1__',
 		locations: [{ line: 1, column: 1, start: 0, end: 31 }],
@@ -43,7 +43,7 @@ test('@import url() LAYER()', () => {
 })
 
 test('@import url() layer(named)', () => {
-	let actual = get_tree('@import url("foo.css") layer(named);')
+	let actual = layer_tree('@import url("foo.css") layer(named);')
 	let expected = [{
 		name: 'named',
 		locations: [{ line: 1, column: 1, start: 0, end: 36 }],
@@ -53,7 +53,7 @@ test('@import url() layer(named)', () => {
 })
 
 test('@import url() LAYER(named)', () => {
-	let actual = get_tree('@import url("foo.css") LAYER(named);')
+	let actual = layer_tree('@import url("foo.css") LAYER(named);')
 	let expected = [{
 		name: 'named',
 		locations: [{ line: 1, column: 1, start: 0, end: 36 }],
@@ -63,7 +63,7 @@ test('@import url() LAYER(named)', () => {
 })
 
 test('@import url() layer(named.nested)', () => {
-	let actual = get_tree('@import url("foo.css") layer(named.nested);')
+	let actual = layer_tree('@import url("foo.css") layer(named.nested);')
 	let expected = [{
 		name: 'named',
 		locations: [{ line: 1, column: 1, start: 0, end: 43 }],
@@ -77,7 +77,7 @@ test('@import url() layer(named.nested)', () => {
 })
 
 test('@import url() layer(named.nested     )', () => {
-	let actual = get_tree('@import url("foo.css") layer(named.nested     );')
+	let actual = layer_tree('@import url("foo.css") layer(named.nested     );')
 	let expected = [{
 		name: 'named',
 		locations: [{ line: 1, column: 1, start: 0, end: 48 }],
@@ -91,7 +91,7 @@ test('@import url() layer(named.nested     )', () => {
 })
 
 test('@import url() layer(/* test */named.nested     )', () => {
-	let actual = get_tree('@import url("foo.css") layer(/* test */named.nested     );')
+	let actual = layer_tree('@import url("foo.css") layer(/* test */named.nested     );')
 	let expected = [{
 		name: 'named',
 		locations: [{ line: 1, column: 1, start: 0, end: 58 }],

test/layer.spec.js

@@ -1,9 +1,9 @@
 import { test } from 'uvu'
 import * as assert from 'uvu/assert'
-import { get_tree } from '../src/index.js'
+import { layer_tree } from '../src/index.js'
 
 test('single anonymous layer without body', () => {
-	let actual = get_tree('@layer;')
+	let actual = layer_tree('@layer;')
 	let expected = [
 		{
 			name: '__anonymous-1__',
@@ -15,7 +15,7 @@ test('single anonymous layer without body', () => {
 })
 
 test('single anonymous layer with body', () => {
-	let actual = get_tree('@layer {}')
+	let actual = layer_tree('@layer {}')
 	let expected = [
 		{
 			name: '__anonymous-1__',
@@ -27,7 +27,7 @@ test('single anonymous layer with body', () => {
 })
 
 test('single named layer without body', () => {
-	let actual = get_tree('@layer first;')
+	let actual = layer_tree('@layer first;')
 	let expected = [
 		{
 			name: 'first',
@@ -39,7 +39,7 @@ test('single named layer without body', () => {
 })
 
 test('single named layer with body', () => {
-	let actual = get_tree('@layer first {}')
+	let actual = layer_tree('@layer first {}')
 	let expected = [
 		{
 			name: 'first',
@@ -51,7 +51,7 @@ test('single named layer with body', () => {
 })
 
 test('multiple named layers in one line', () => {
-	let actual = get_tree(`@layer first, second;`)
+	let actual = layer_tree(`@layer first, second;`)
 	let expected = [
 		{
 			name: 'first',
@@ -68,7 +68,7 @@ test('multiple named layers in one line', () => {
 })
 
 test('repeated use of the same layer name', () => {
-	let actual = get_tree(`
+	let actual = layer_tree(`
 		@layer first {}
 		@layer first {}
 	`)
@@ -86,7 +86,7 @@ test('repeated use of the same layer name', () => {
 })
 
 test('nested layers', () => {
-	let actual = get_tree(`
+	let actual = layer_tree(`
 		@layer first {
 			@layer second {
 				@layer third {}
@@ -123,7 +123,7 @@ test('nested layers', () => {
 })
 
 test('nested layers with anonymous layers', () => {
-	let actual = get_tree(`
+	let actual = layer_tree(`
 		@layer {
 			@layer {}
 		}
@@ -144,8 +144,28 @@ test('nested layers with anonymous layers', () => {
 	assert.equal(actual, expected)
 })
 
+test('consecutive anonymous layers', () => {
+	let actual = layer_tree(`
+		@layer {}
+		@layer {}
+	`)
+	let expected = [
+		{
+			name: '__anonymous-1__',
+			locations: [{ line: 2, column: 3, start: 3, end: 12 }],
+			children: [],
+		},
+		{
+			name: '__anonymous-2__',
+			locations: [{ line: 3, column: 3, start: 15, end: 24 }],
+			children: [],
+		},
+	]
+	assert.equal(actual, expected)
+})
+
 test('nested layers with anonymous layers and duplicate names', () => {
-	let actual = get_tree(`
+	let actual = layer_tree(`
 		@layer {
 			@layer first {}
 		}