@telestack/db-sdk 1.0.5 → 1.0.8

package/dist/index.d.ts

@@ -116,6 +116,8 @@ export declare class Query<T = any> {
     private buildWhereClause;
     /** Fetch documents matching the query */
     get(): Promise<T[]>;
+    /** Apply sorting and limiting in-memory */
+    private applyOptions;
     /** Check if a document matches the local filters */
     private matches;
     /** Subscribe to realtime updates for this query */

package/dist/index.js

@@ -347,7 +347,7 @@ export class Query {
             if (!res.ok)
                 throw new TelestackError(await res.text());
             const data = await res.json();
-            const docs = data.map((d) => ({ id: d.id, ...d.data }));
+            const docs = data.map((d) => ({ id: d.id, data: d.data }));
             // Cache results locally if persistence enabled
             if (persistence) {
                 for (const d of data) {
@@ -363,24 +363,34 @@ export class Query {
                 // Filter docs that belong to this collection and match filters
                 const filtered = allDocs
                     .filter(d => d.path.startsWith(this.path) && this.matches(d.data))
-                    .map(d => ({ id: d.path.split('/').pop(), ...d.data, metadata: { fromCache: true, hasPendingWrites: true } }));
-                // Sort locally if needed
-                if (this.orderByField) {
-                    filtered.sort((a, b) => {
-                        const valA = a[this.orderByField];
-                        const valB = b[this.orderByField];
-                        if (this.orderDirection === 'asc')
-                            return valA > valB ? 1 : -1;
-                        return valA < valB ? 1 : -1;
-                    });
-                }
-                if (this.limitCount)
-                    return filtered.slice(0, this.limitCount);
-                return filtered;
+                    .map(d => ({ id: d.path.split('/').pop(), data: d.data, metadata: { fromCache: true, hasPendingWrites: true } }));
+                return this.applyOptions(filtered);
             }
             throw e;
         }
     }
+    /** Apply sorting and limiting in-memory */
+    applyOptions(docs) {
+        let results = [...docs];
+        if (this.orderByField) {
+            results.sort((a, b) => {
+                const valA = a.data ? a.data[this.orderByField] : a[this.orderByField];
+                const valB = b.data ? b.data[this.orderByField] : b[this.orderByField];
+                if (valA === undefined || valA === null)
+                    return 1;
+                if (valB === undefined || valB === null)
+                    return -1;
+                if (valA === valB)
+                    return 0;
+                const comparison = valA > valB ? 1 : -1;
+                return this.orderDirection === 'asc' ? comparison : -comparison;
+            });
+        }
+        if (this.limitCount) {
+            results = results.slice(0, this.limitCount);
+        }
+        return results;
+    }
     /** Check if a document matches the local filters */
     matches(doc) {
         for (const filter of this.filters) {
@@ -434,8 +444,8 @@ export class Query {
         }
         const debouncedCallback = () => {
             if (this.debounceTimer)
-                clearTimeout(this.debounceTimer);
-            this.debounceTimer = setTimeout(() => callback([...this.docsCache]), 50);
+                cancelAnimationFrame(this.debounceTimer);
+            this.debounceTimer = requestAnimationFrame(() => callback([...this.docsCache]));
         };
         sub.on('publication', async (ctx) => {
             const event = ctx.data;
@@ -446,26 +456,14 @@ export class Query {
             const docId = event.id || (event.doc && event.doc.id);
             if (event.type === 'CREATED' || event.type === 'SET') {
                 if (this.matches(event.doc.data)) {
-                    if (this.limitCount || this.orderByField) {
-                        const docs = await this.get();
-                        this.docsCache = docs;
-                        callback(docs);
-                    }
-                    else {
-                        this.docsCache = [...this.docsCache.filter(d => d.id !== docId), { id: docId, data: event.doc.data }];
-                        changed = true;
-                    }
+                    this.docsCache = [...this.docsCache.filter(d => d.id !== docId), { id: docId, data: event.doc.data }];
+                    changed = true;
                 }
             }
             else if (event.type === 'UPDATED') {
                 const docData = event.doc ? event.doc.data : (event.patch ? event.patch : {});
                 const matches = this.matches(docData);
-                if (this.limitCount || this.orderByField) {
-                    const docs = await this.get();
-                    this.docsCache = docs;
-                    callback(docs);
-                }
-                else if (matches) {
+                if (matches) {
                     this.docsCache = this.docsCache.map(d => d.id === docId ? { ...d, data: { ...d.data, ...docData } } : d);
                     changed = true;
                 }
@@ -478,7 +476,8 @@ export class Query {
                 this.docsCache = this.docsCache.filter(d => d.id !== docId);
                 changed = true;
             }
-            if (changed && !(this.limitCount || this.orderByField)) {
+            if (changed) {
+                this.docsCache = this.applyOptions(this.docsCache);
                 debouncedCallback();
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@telestack/db-sdk",
-    "version": "1.0.5",
+    "version": "1.0.8",
     "description": "Fluent, real-time SDK for Telestack DB",
     "type": "module",
     "main": "dist/index.js",