@jcbuisson/express-x-drizzle 1.0.8 → 3.1.5

package/package.json

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

package/src/drizzle-plugins.mjs

@@ -5,6 +5,17 @@ import { Mutex, truncateString, computeSyncResult } from '@jcbuisson/express-x'
 
 //////////////////////////       UTILITIES       //////////////////////////
 
+function stringifyWithSortedKeys(obj) {
+   return JSON.stringify(obj, (_, value) => {
+      if (value && typeof value === 'object' && !Array.isArray(value) && Object.prototype.toString.call(value) === '[object Object]') {
+         const sorted = {}
+         Object.keys(value).sort().forEach(k => { sorted[k] = value[k] })
+         return sorted
+      }
+      return value
+   })
+}
+
 function whereToDrizzleFilters(table, where) {
    const conditions = Object.entries(where)
       .filter(([_, value]) => value !== undefined)
@@ -87,7 +98,11 @@ 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 [meta] = await tx.update(metadata).set({ deleted_at: new Date(deleted_at) }).where(eq(metadata.uid, uid)).returning();
+               const ts = new Date(deleted_at)
+               const [meta] = await tx.insert(metadata)
+                  .values({ uid, deleted_at: ts })
+                  .onConflictDoUpdate({ target: metadata.uid, set: { deleted_at: ts } })
+                  .returning();
                return [value, meta]
             })
          },
@@ -103,7 +118,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
       go: async (modelName, where, cutoffDate, clientMetadataDict) => {
 
          // get or create a mutex specific to modelName + where
-         const mutexKey = `${modelName}:${JSON.stringify(Object.fromEntries(Object.entries(where).sort()))}`
+         const mutexKey = `${modelName}:${stringifyWithSortedKeys(where)}`
          if (!syncMutexes.has(mutexKey)) syncMutexes.set(mutexKey, new Mutex())
          // acquire it: no other sync operation from another client on this model+where can occur in parallel
          await syncMutexes.get(mutexKey).acquire()