fix: collection deletes are now processed correctly

Author: goknsh

.changeset/little-bikes-cheer.md

@@ -0,0 +1,5 @@
+---
+'svelte-query-pocketbase': patch
+---
+
+fix: collection deletes are now processed correctly

README.md

@@ -1,6 +1,6 @@
 # svelte-query-pocketbase
 
-TanStack Query Svelte store wrappers around Pocketbase Realtime.
+TanStack Query wrappers around Pocketbase Realtime for Svelte
 
 ## Installation
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "svelte-query-pocketbase",
-	"description": "TanStack Query Svelte store wrappers around Pocketbase Realtime",
+	"description": "TanStack Query wrappers around Pocketbase Realtime for Svelte",
 	"version": "0.0.1-beta.8",
 	"type": "module",
 	"scripts": {

src/lib/queries/collection.ts

@@ -55,7 +55,7 @@ const collectionStoreCallback = async <
 			data = produce(data, (draft) => {
 				let updateIndex = draft.findIndex((item) => item.id === expandedRecord.id);
 				if (updateIndex !== -1) {
-					if (new Date(expandedRecord.updated) > new Date(draft[updateIndex].updated)) {
+					if (new Date(expandedRecord.updated) >= new Date(draft[updateIndex].updated)) {
 						draft[updateIndex] = expandedRecord as Draft<T>;
 					} else {
 						actionIgnored = true;
@@ -69,7 +69,7 @@ const collectionStoreCallback = async <
 			data = produce(data, (draft) => {
 				let deleteIndex = draft.findIndex((item) => item.id === expandedRecord.id);
 				if (deleteIndex !== -1) {
-					if (new Date(expandedRecord.updated) > new Date(draft[deleteIndex].updated)) {
+					if (new Date(expandedRecord.updated) >= new Date(draft[deleteIndex].updated)) {
 						draft.splice(deleteIndex, 1);
 					} else {
 						actionIgnored = true;

src/lib/queries/infinite-collection.ts

@@ -66,7 +66,7 @@ const infiniteCollectionStoreCallback = async <
 					allItems = produce(allItems, (draft) => {
 						updateIndex = draft.findIndex((item) => item.id === expandedRecord.id);
 						if (updateIndex !== -1) {
-							if (new Date(expandedRecord.updated) > new Date(draft[updateIndex].updated)) {
+							if (new Date(expandedRecord.updated) >= new Date(draft[updateIndex].updated)) {
 								draft[updateIndex] = expandedRecord as Draft<T>;
 							} else {
 								actionIgnored = true;
@@ -79,7 +79,7 @@ const infiniteCollectionStoreCallback = async <
 				case 'delete':
 					allItems = produce(allItems, (draft) => {
 						deleteIndex = draft.findIndex((item) => item.id === expandedRecord.id);
-						if (new Date(expandedRecord.updated) > new Date(draft[deleteIndex].updated)) {
+						if (new Date(expandedRecord.updated) >= new Date(draft[deleteIndex].updated)) {
 							draft.splice(deleteIndex, 1);
 						} else {
 							actionIgnored = true;
@@ -165,9 +165,10 @@ const infiniteCollectionStoreCallback = async <
 
 				if (
 					totalItemsWeHave === totalItemsInDatabase &&
+					data.pages.length > 1 &&
 					data.pages[data.pages.length - 1].items.length === 0
 				) {
-					// delete empty pages only if we have all items in the database
+					// delete empty pages only if we have all items in the database, and there is at least one page
 					data = produce(data, (draft) => {
 						draft.pages.pop();
 						draft.pageParams.pop();

src/routes/+page.svelte

@@ -6,13 +6,7 @@
 
 	const pocketbase = new Pocketbase('https://voel.local');
 
-	const query = createInfiniteCollectionQuery(pocketbase.collection('test'), {
-		page: 2,
-		perPage: 1,
-		queryParams: { sort: '+name' },
-		sortFunction: (a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)
-		// filterFunction: (item) => item.name.includes('bunbee')
-	});
+	const query = createInfiniteCollectionQuery(pocketbase.collection('test'));
 
 	// onMount(() => {
 	// 	setTimeout(() => {