@foretag/tanstack-db-surrealdb 0.1.15 → 0.1.17

package/dist/index.js

@@ -30,7 +30,9 @@ var import_surrealdb = require("surrealdb");
 function manageTable(db, useLoro, { name, ...args }) {
   const fields = args.fields ?? "*";
   const listAll = async () => {
-    return await db.select(new import_surrealdb.Table(name)).where(args.where).fields(...fields);
+    let q = db.select(new import_surrealdb.Table(name));
+    if (args.where) q = q.where(args.where);
+    return await q.fields(...fields);
   };
   const listActive = async () => {
     if (!useLoro) return listAll();
@@ -40,35 +42,46 @@ function manageTable(db, useLoro, { name, ...args }) {
     await db.create(new import_surrealdb.Table(name)).content(data);
   };
   const update = async (id, data) => {
-    if (useLoro) {
+    if (!useLoro) {
+      await db.update(id).merge({
+        ...data
+      });
+      return;
+    }
+    try {
       await db.update(id).merge({
         ...data,
         sync_deleted: false,
         updated_at: Date.now()
       });
-    } else {
-      await db.update(id).merge({
-        ...data
-      });
+    } catch (error) {
+      console.warn(
+        `Please ensure the table ${name} has sync_deleted and updated_at fields defined`
+      );
+      console.error(
+        "Failed to update record with Loro (CRDTs) with: ",
+        error
+      );
     }
   };
   const remove = async (id) => {
     await db.delete(id);
   };
   const softDelete = async (id) => {
-    if (useLoro) {
-      await db.update(id).merge({
-        sync_deleted: true,
-        updated_at: Date.now()
-      });
-    } else {
+    if (!useLoro) {
       await db.delete(id);
+      return;
     }
+    await db.upsert(id).merge({
+      sync_deleted: true,
+      updated_at: Date.now()
+    });
   };
   const subscribe = (cb) => {
     let killed = false;
     let live;
     const on = ({ action, value }) => {
+      console.debug("[Surreal Live]", name, action, value);
       if (action === "KILLED") return;
       if (action === "CREATE") cb({ type: "insert", row: value });
       else if (action === "UPDATE")
@@ -276,6 +289,11 @@ function surrealCollectionOptions({
     commit,
     markReady
   }) => {
+    if (!db.isFeatureSupported(import_surrealdb2.Features.LiveQueries)) {
+      markReady();
+      return () => {
+      };
+    }
     let offLive = null;
     const makeTombstone = (id2) => ({
       id: new import_surrealdb2.RecordId(config.table.name, id2).toString(),
@@ -286,11 +304,8 @@ function surrealCollectionOptions({
       try {
         const serverRows = await table.listAll();
         begin();
-        if (useLoro) {
-          reconcileBoot(serverRows, write);
-        } else {
-          diffAndEmit(serverRows, write);
-        }
+        if (useLoro) reconcileBoot(serverRows, write);
+        else diffAndEmit(serverRows, write);
         commit();
         markReady();
         await flushPushQueue();
@@ -373,9 +388,7 @@ function surrealCollectionOptions({
     for (const m of p.transaction.mutations) {
       if (m.type !== "delete") continue;
       const id2 = m.key;
-      if (useLoro) {
-        loroRemove(keyOf(id2));
-      }
+      if (useLoro) loroRemove(keyOf(id2));
       await table.softDelete(new import_surrealdb2.RecordId(config.table.name, keyOf(id2)));
     }
     return resultRows;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // src/index.ts
 import { LoroDoc } from "loro-crdt";
-import { RecordId } from "surrealdb";
+import { Features as Features2, RecordId } from "surrealdb";
 
 // src/table.ts
 import {
@@ -12,7 +12,9 @@ import {
 function manageTable(db, useLoro, { name, ...args }) {
   const fields = args.fields ?? "*";
   const listAll = async () => {
-    return await db.select(new Table(name)).where(args.where).fields(...fields);
+    let q = db.select(new Table(name));
+    if (args.where) q = q.where(args.where);
+    return await q.fields(...fields);
   };
   const listActive = async () => {
     if (!useLoro) return listAll();
@@ -22,35 +24,46 @@ function manageTable(db, useLoro, { name, ...args }) {
     await db.create(new Table(name)).content(data);
   };
   const update = async (id, data) => {
-    if (useLoro) {
+    if (!useLoro) {
+      await db.update(id).merge({
+        ...data
+      });
+      return;
+    }
+    try {
       await db.update(id).merge({
         ...data,
         sync_deleted: false,
         updated_at: Date.now()
       });
-    } else {
-      await db.update(id).merge({
-        ...data
-      });
+    } catch (error) {
+      console.warn(
+        `Please ensure the table ${name} has sync_deleted and updated_at fields defined`
+      );
+      console.error(
+        "Failed to update record with Loro (CRDTs) with: ",
+        error
+      );
     }
   };
   const remove = async (id) => {
     await db.delete(id);
   };
   const softDelete = async (id) => {
-    if (useLoro) {
-      await db.update(id).merge({
-        sync_deleted: true,
-        updated_at: Date.now()
-      });
-    } else {
+    if (!useLoro) {
       await db.delete(id);
+      return;
     }
+    await db.upsert(id).merge({
+      sync_deleted: true,
+      updated_at: Date.now()
+    });
   };
   const subscribe = (cb) => {
     let killed = false;
     let live;
     const on = ({ action, value }) => {
+      console.debug("[Surreal Live]", name, action, value);
       if (action === "KILLED") return;
       if (action === "CREATE") cb({ type: "insert", row: value });
       else if (action === "UPDATE")
@@ -258,6 +271,11 @@ function surrealCollectionOptions({
     commit,
     markReady
   }) => {
+    if (!db.isFeatureSupported(Features2.LiveQueries)) {
+      markReady();
+      return () => {
+      };
+    }
     let offLive = null;
     const makeTombstone = (id2) => ({
       id: new RecordId(config.table.name, id2).toString(),
@@ -268,11 +286,8 @@ function surrealCollectionOptions({
       try {
         const serverRows = await table.listAll();
         begin();
-        if (useLoro) {
-          reconcileBoot(serverRows, write);
-        } else {
-          diffAndEmit(serverRows, write);
-        }
+        if (useLoro) reconcileBoot(serverRows, write);
+        else diffAndEmit(serverRows, write);
         commit();
         markReady();
         await flushPushQueue();
@@ -355,9 +370,7 @@ function surrealCollectionOptions({
     for (const m of p.transaction.mutations) {
       if (m.type !== "delete") continue;
       const id2 = m.key;
-      if (useLoro) {
-        loroRemove(keyOf(id2));
-      }
+      if (useLoro) loroRemove(keyOf(id2));
       await table.softDelete(new RecordId(config.table.name, keyOf(id2)));
     }
     return resultRows;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@foretag/tanstack-db-surrealdb",
 	"description": "Add Offline / Local First Caching & Syncing to your SurrealDB app with TanstackDB and Loro (CRDTs)",
-	"version": "0.1.15",
+	"version": "0.1.17",
 	"files": [
 		"dist"
 	],
@@ -40,17 +40,17 @@
 		"build": "tsup src/index.ts --dts --format esm,cjs"
 	},
 	"dependencies": {
-		"loro-crdt": "^1.9.0"
+		"loro-crdt": "^1.10.2"
 	},
 	"peerDependencies": {
-		"@tanstack/db": "^0.5.0",
+		"@tanstack/db": "^0.5.10",
 		"@tanstack/query-db-collection": "^1.0.0",
-		"surrealdb": "2.0.0-alpha.13"
+		"surrealdb": "2.0.0-alpha.14"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.5",
-		"@tanstack/svelte-db": "^0.1.43",
-		"surrealdb": "2.0.0-alpha.13",
+		"@biomejs/biome": "^2.3.8",
+		"@tanstack/svelte-db": "^0.1.53",
+		"surrealdb": "2.0.0-alpha.14",
 		"tsup": "^8.5.1"
 	}
 }