@jcbuisson/express-x-drizzle 3.1.12 → 3.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-drizzle",
-  "version": "3.1.12",
+  "version": "3.1.28",
   "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,16 @@ 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 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]
+               }
+               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 } })
@@ -211,9 +243,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
             }