Merge branch 'main' into demo-page-ally

Author: cdcarson

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @careswitch/svelte-data-table
 
+## 0.5.0
+
+### Minor Changes
+
+- 48cfdcf: Introduce `id` in column definition to allow multiple columns for the same key
+
 ## 0.4.0
 
 ### Minor Changes

README.md

@@ -33,25 +33,25 @@ _Requires Svelte 5 peer dependency_
 			{ id: 2, name: 'Jane Doe', status: 'inactive' }
 		],
 		columns: [
-			{ key: 'id', name: 'ID' },
-			{ key: 'name', name: 'Name' },
-			{ key: 'status', name: 'Status' }
+			{ id: 'id', key: 'id', name: 'ID' },
+			{ id: 'name', key: 'name', name: 'Name' },
+			{ id: 'status', key: 'status', name: 'Status' }
 		]
 	});
 </script>
 
 <table>
 	<thead>
 		<tr>
-			{#each table.columns as column (column.key)}
+			{#each table.columns as column (column.id)}
 				<th>{column.name}</th>
 			{/each}
 		</tr>
 	</thead>
 	<tbody>
 		{#each table.rows as row (row.id)}
 			<tr>
-				{#each table.columns as column (column.key)}
+				{#each table.columns as column (column.id)}
 					<td>{row[column.key]}</td>
 				{/each}
 			</tr>

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@careswitch/svelte-data-table",
 	"description": "Small, fast data table library for Svelte 5 with client-side sorting, filtering, and pagination.",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"homepage": "https://careswitch-svelte-data-table.vercel.app",
 	"license": "MIT",
 	"keywords": [

src/index.test.ts

@@ -11,9 +11,16 @@ describe('DataTable', () => {
 	];
 
 	const columns = [
-		{ key: 'id', name: 'ID', sortable: true },
-		{ key: 'name', name: 'Name', sortable: true },
-		{ key: 'age', name: 'Age', sortable: true }
+		{ id: 'id', key: 'id', name: 'ID', sortable: true },
+		{ id: 'name', key: 'name', name: 'Name', sortable: true },
+		{ id: 'age', key: 'age', name: 'Age', sortable: true },
+		{
+			id: 'ageGroup',
+			key: 'age',
+			name: 'Age Group',
+			sortable: true,
+			getValue: (row) => (row.age < 30 ? 'Young' : 'Adult')
+		}
 	] satisfies ColumnDef<(typeof sampleData)[0]>[];
 
 	describe('Initialization', () => {
@@ -60,12 +67,18 @@ describe('DataTable', () => {
 			const incompleteData = [
 				{ id: 1, name: 'Alice' },
 				{ id: 2, age: 25 }
-			];
+			] as any[];
 			const table = new DataTable({ data: incompleteData, columns });
 			expect(table.rows).toHaveLength(2);
 			expect(table.rows[0].age).toBeUndefined();
 			expect(table.rows[1].name).toBeUndefined();
 		});
+
+		it('should handle multiple columns with the same key', () => {
+			const table = new DataTable({ data: sampleData, columns });
+			expect(table.columns).toHaveLength(4);
+			expect(table.columns.filter((col) => col.key === 'age')).toHaveLength(2);
+		});
 	});
 
 	describe('Sorting', () => {
@@ -101,7 +114,7 @@ describe('DataTable', () => {
 
 		it('should handle sorting with custom sorter function', () => {
 			const customColumns = columns.map((col) =>
-				col.key === 'name'
+				col.id === 'name'
 					? {
 							...col,
 							sorter: (a, b) => b.name.localeCompare(a.name) // Reverse alphabetical order
@@ -136,14 +149,22 @@ describe('DataTable', () => {
 				{ id: 1, name: 'Alice', age: null },
 				{ id: 2, name: 'Bob', age: null },
 				{ id: 3, name: 'Charlie', age: null }
-			];
+			] as any[];
 			const table = new DataTable({ data: nullData, columns });
 			table.toggleSort('age');
 			expect(table.rows).toHaveLength(3);
 			// The order should remain unchanged
 			expect(table.rows[0].name).toBe('Alice');
 			expect(table.rows[2].name).toBe('Charlie');
 		});
+
+		it('should sort independently for columns with the same key', () => {
+			const table = new DataTable({ data: sampleData, columns });
+			table.toggleSort('age');
+			const ageSortState = table.getSortState('age');
+			const ageGroupSortState = table.getSortState('ageGroup');
+			expect(ageSortState).not.toBe(ageGroupSortState);
+		});
 	});
 
 	describe('Filtering', () => {
@@ -167,6 +188,13 @@ describe('DataTable', () => {
 			).toBe(true);
 		});
 
+		it('should filter derived columns', () => {
+			const table = new DataTable({ data: sampleData, columns });
+			table.setFilter('ageGroup', ['Young']);
+			expect(table.rows).toHaveLength(2);
+			expect(table.rows.every((row) => row.age < 30)).toBe(true);
+		});
+
 		it('should clear filter', () => {
 			const table = new DataTable({ data: sampleData, columns });
 			table.setFilter('age', [30]);
@@ -231,6 +259,13 @@ describe('DataTable', () => {
 			expect(table.rows).toHaveLength(2);
 			expect(table.rows.every((row) => row.name === 'Alice' || row.name === 'Bob')).toBe(true);
 		});
+
+		it('should filter independently for columns with the same key', () => {
+			const table = new DataTable({ data: sampleData, columns });
+			table.setFilter('age', [30, 35]);
+			table.setFilter('ageGroup', ['Young']);
+			expect(table.rows).toHaveLength(0); // No rows match both filters
+		});
 	});
 
 	describe('Pagination', () => {
@@ -276,19 +311,7 @@ describe('DataTable', () => {
 		});
 	});
 
-	describe('baseRows functionality', () => {
-		const sampleData = [
-			{ id: 1, name: 'Alice', age: 30 },
-			{ id: 2, name: 'Bob', age: 25 },
-			{ id: 3, name: 'Charlie', age: 35 }
-		];
-
-		const columns = [
-			{ key: 'id', name: 'ID', sortable: true },
-			{ key: 'name', name: 'Name', sortable: true },
-			{ key: 'age', name: 'Age', sortable: true }
-		] satisfies ColumnDef<(typeof sampleData)[0]>[];
-
+	describe('baseRows', () => {
 		it('should return the original data when getting baseRows', () => {
 			const table = new DataTable({ data: sampleData, columns });
 			expect(table.baseRows).toEqual(sampleData);