@jcbuisson/express-x-drizzle 3.1.11 → 3.1.25

package/CLAUDE.md

@@ -24,6 +24,6 @@ The library exports one function: `drizzleOfflinePlugin(app, db, metadata, model
 
 1. **Per-model services** — For each table in `models`, registers an `express-x` service named after the table. Each service exposes: `findUnique`, `findMany`, `createWithMeta`, `updateWithMeta`, `deleteWithMeta`. All mutation methods write to both the model table and the `metadata` table inside a transaction, keeping timestamps in sync.
 
-2. **`sync` service** — Implements an offline-first reconciliation algorithm. The client sends its local metadata dictionary (`{ uid → { created_at, updated_at, deleted_at } }`) plus a `cutoffDate`. The server computes set intersections between client UIDs and database UIDs, then determines add/update/delete operations for both sides. A `Mutex` (from `express-x`) serializes concurrent sync calls globally. The return value tells the client which records to add, update, or delete locally, and which UIDs the client should push to the database with full data.
+2. **`sync` service** — Implements an offline-first reconciliation algorithm. The client sends its local metadata dictionary (`{ uid → { created_at, updated_at, deleted_at } }`). The server computes set intersections between client UIDs and database UIDs, then determines add/update/delete operations for both sides. An overlap-aware lock serializes sync calls whose `where` scopes can touch the same records. The return value tells the client which records to add, update, or delete locally, and which UIDs the client should push to the database with full data.
 
 **Key invariant:** The sync algorithm compares `updated_at` (falling back to `created_at`) timestamps to decide which side wins a conflict — the most recently updated side wins. Records marked `deleted_at` on the client trigger a soft-delete propagation to the database.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-drizzle",
-  "version": "3.1.11",
+  "version": "3.1.25",
   "description": "Drizzle ORM plugins for express-x framework",
   "main": "src/drizzle-plugins.mjs",
   "type": "module",

package/src/drizzle-plugins.mjs

@@ -140,6 +140,14 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
          createWithMeta: async (uid, data, created_at) => {
             const ts = new Date(created_at)
             return await db.transaction(async (tx) => {
+               const existingMeta = (await tx.select().from(metadata).where(eq(metadata.uid, uid)))[0] ?? null
+               const existingTime = existingMeta
+                  ? new Date(existingMeta.deleted_at || existingMeta.updated_at || existingMeta.created_at)
+                  : null
+               if (existingTime && existingTime > ts) {
+                  const value = (await tx.select().from(model).where(eq(model.uid, uid)))[0] ?? undefined
+                  return [value, existingMeta]
+               }
                // Upsert: if the model row already exists (e.g. a concurrent createWithMeta
                // from the direct create() path landed before the sync's addDatabase step),
                // update it instead of throwing a PK conflict that would rollback the
@@ -163,12 +171,28 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
          updateWithMeta: async (uid, data, updated_at) => {
             const ts = updated_at ? new Date(updated_at) : null
             return await db.transaction(async (tx) => {
-               const [value] = await tx.update(model).set(data).where(eq(model.uid, uid)).returning();
+               let [value] = await tx.update(model).set(data).where(eq(model.uid, uid)).returning();
+               const existingMeta = (await tx.select().from(metadata).where(eq(metadata.uid, uid)))[0] ?? null
+               if (!value && existingMeta?.deleted_at) {
+                  const deletedAt = new Date(existingMeta.deleted_at)
+                  if (ts && ts > deletedAt) {
+                     ;[value] = await tx.insert(model)
+                        .values({ uid, ...data })
+                        .onConflictDoUpdate({ target: model.uid, set: data })
+                        .returning();
+                     const [meta] = await tx.insert(metadata)
+                        .values({ uid, updated_at: ts })
+                        .onConflictDoUpdate({ target: metadata.uid, set: { updated_at: ts, deleted_at: null } })
+                        .returning();
+                     return [value, meta]
+                  }
+                  return [value, existingMeta]
+               }
                // Upsert metadata: if the row is missing (data-integrity gap where the
                // model row exists but no metadata row), create it so the loop stops.
                const [meta] = await tx.insert(metadata)
                   .values({ uid, updated_at: ts })
-                  .onConflictDoUpdate({ target: metadata.uid, set: { updated_at: ts } })
+                  .onConflictDoUpdate({ target: metadata.uid, set: { updated_at: ts, deleted_at: null } })
                   .returning();
                return [value, meta]
             })
@@ -176,8 +200,14 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
 
          deleteWithMeta: async (uid, deleted_at) => {
             return await db.transaction(async (tx) => {
-               const [value] = await tx.delete(model).where(eq(model.uid, uid)).returning();
                const ts = new Date(deleted_at)
+               const existingMeta = (await tx.select().from(metadata).where(eq(metadata.uid, uid)))[0] ?? null
+               const existingUpdatedAt = existingMeta ? new Date(existingMeta.updated_at || existingMeta.created_at) : null
+               if (existingUpdatedAt && existingUpdatedAt > ts) {
+                  const value = (await tx.select().from(model).where(eq(model.uid, uid)))[0] ?? undefined
+                  return [value, existingMeta]
+               }
+               const [value] = await tx.delete(model).where(eq(model.uid, uid)).returning();
                const [meta] = await tx.insert(metadata)
                   .values({ uid, deleted_at: ts })
                   .onConflictDoUpdate({ target: metadata.uid, set: { deleted_at: ts } })
@@ -193,8 +223,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
    // add a synchronization service
    app.createService('sync', {
 
-      // CUTOFFDATE INUTILE ?
-      go: async (modelName, where, cutoffDate, clientMetadataDict) => {
+      go: async (modelName, where, clientMetadataDict) => {
 
          // overlap-aware lock so independent scopes can still run in parallel, but overlapping where predicates do not
          if (!syncLocks.has(modelName)) syncLocks.set(modelName, new OverlapLock())
@@ -202,7 +231,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
          const releaseSyncLock = await syncLock.acquire(where)
 
          try {
-            console.log('>>>>> SYNC', modelName, where, cutoffDate)
+            console.log('>>>>> SYNC', modelName, where)
             const databaseService = app.service(modelName)
       
             // STEP1: get existing database `where` values and build a dictionary
@@ -212,9 +241,14 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
                return accu
             }, {})
 
-            // STEP 2: fetch metadata for each database record
+            // STEP 2: fetch metadata for each database record and each client-sent uid.
+            // Client uids matter when the server row was deleted: only the tombstone remains.
             const databaseMetadataDict = {}
-            for (const uid of Object.keys(databaseValuesDict)) {
+            const metadataUids = new Set([
+               ...Object.keys(databaseValuesDict),
+               ...Object.keys(clientMetadataDict ?? {}),
+            ])
+            for (const uid of metadataUids) {
                const meta = (await db.select().from(metadata).where(eq(metadata.uid, uid)))[0] ?? null
                if (meta) databaseMetadataDict[uid] = meta
             }