@instantdb/core 0.22.164 → 0.22.165

package/src/instaql.ts

@@ -628,20 +628,29 @@ function comparableDate(x) {
   return new Date(x).getTime();
 }
 
-function isBefore(startCursor, orderAttr, direction, idVec) {
-  const [c_e, _c_a, c_v, c_t] = startCursor;
-  const compareVal = direction === 'desc' ? 1 : -1;
+function compareToCursor(cursor, orderAttr, idVec) {
+  const [c_e, _c_a, c_v, c_t] = cursor;
+
   if (orderAttr['forward-identity']?.[2] === 'id') {
-    return compareOrderTriples(idVec, [c_e, c_t], null) === compareVal;
+    return compareOrderTriples(idVec, [c_e, c_t], null);
   }
+
   const [e, v] = idVec;
   const dataType = orderAttr['checked-data-type'];
   const v_new = dataType === 'date' ? comparableDate(v) : v;
   const c_v_new = dataType === 'date' ? comparableDate(c_v) : c_v;
 
-  return (
-    compareOrderTriples([e, v_new], [c_e, c_v_new], dataType) === compareVal
-  );
+  return compareOrderTriples([e, v_new], [c_e, c_v_new], dataType);
+}
+
+function isBefore(startCursor, orderAttr, direction, idVec) {
+  const cmp = compareToCursor(startCursor, orderAttr, idVec);
+  return direction === 'desc' ? cmp > 0 : cmp < 0;
+}
+
+function isAfter(endCursor, orderAttr, direction, idVec) {
+  const cmp = compareToCursor(endCursor, orderAttr, idVec);
+  return direction === 'desc' ? cmp < 0 : cmp > 0;
 }
 
 function orderAttrFromCursor(attrsStore: s.AttrsStore, cursor) {
@@ -705,6 +714,7 @@ function runDataloadAndReturnObjects(
   let idVecs = datalogQuery(store, dq);
 
   const startCursor = pageInfo?.['start-cursor'];
+  const endCursor = pageInfo?.['end-cursor'];
   const orderAttr = getOrderAttr(attrsStore, etype, startCursor, order);
 
   if (orderAttr && orderAttr?.['forward-identity']?.[2] !== 'id') {
@@ -748,6 +758,14 @@ function runDataloadAndReturnObjects(
       continue;
     }
 
+    if (
+      endCursor &&
+      orderAttr &&
+      isAfter(endCursor, orderAttr, direction, idVec)
+    ) {
+      continue;
+    }
+
     const obj = s.getAsObject(store, attrs, id);
     if (obj) {
       objects[id] = obj;

package/src/queryTypes.ts

@@ -378,7 +378,7 @@ type InstaQLEntity<
     InstaQLEntitySubqueryResult<Schema, EntityName, Subquery, UseDates>
 >;
 
-type InstaQLQueryEntityResult<
+export type InstaQLQueryEntityResult<
   Entities extends EntitiesDef,
   EntityName extends keyof Entities,
   Query extends {
@@ -712,7 +712,6 @@ export {
   InstaQLQueryResult,
   InstaQLParams,
   InstaQLOptions,
-  InstaQLQueryEntityResult,
   InstaQLEntitySubquery,
   InstaQLEntity,
   InstaQLResult,

package/src/utils/{Deferred.js → Deferred.ts}

@@ -1,7 +1,7 @@
-export class Deferred {
-  promise;
-  _resolve;
-  _reject;
+export class Deferred<T = any> {
+  promise: Promise<T>;
+  _resolve: (value: T) => void;
+  _reject: (...reason: any) => void;
 
   constructor() {
     this.promise = new Promise((resolve, reject) => {

package/src/utils/weakHash.ts

@@ -57,6 +57,10 @@ export default function weakHash(input: any): string {
 
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
+      if (input[key] === undefined) {
+        // Ignore undefined keys in the hash
+        continue;
+      }
       // Hash the key using string hash
       const keyHash = weakHash(key);
       hash ^= parseInt(keyHash, 16);

package/vitest.config.ts

@@ -9,9 +9,15 @@ export default defineConfig({
         test: {
           name: 'e2e',
           include: ['**/**.e2e.test.ts'],
+          expect: {
+            poll: {
+              timeout: 10_000,
+            },
+          },
           browser: {
             enabled: true,
             provider: playwright(),
+            screenshotFailures: false,
             headless: true,
             instances: [{ browser: 'chromium' }],
           },