@symbo.ls/sdk 2.32.2 → 2.32.5

package/src/services/CollabService.js

@@ -3,9 +3,8 @@ import { CollabClient } from '../utils/CollabClient.js'
 import { RootStateManager } from '../state/RootStateManager.js'
 import { rootBus } from '../state/rootEventBus.js'
 import { validateParams } from '../utils/validation.js'
-// Direct import to allow deep stringification in non-browser (Node) environments
-import { deepStringify } from '@domql/utils'
-// (helper conversions reserved for future features)
+import { deepStringifyFunctions } from '@domql/utils'
+import { preprocessChanges } from '../utils/changePreprocessor.js'
 
 export class CollabService extends BaseService {
   constructor(config) {
@@ -71,7 +70,7 @@ export class CollabService extends BaseService {
     }
 
     // 🌐 Ensure we always have a usable `__element` stub so that calls like
-    // `el.call('openNotification', …)` or `el.call('deepStringify', …)` do not
+    // `el.call('openNotification', …)` or `el.call('deepStringifyFunctions', …)` do not
     // crash in headless / Node.js environments (e.g. integration tests).
     const root = this._stateManager?.root
 
@@ -92,9 +91,9 @@ export class CollabService extends BaseService {
               logger(`[Notification] ${title}${message ? ` – ${message}` : ''}`)
               return
             }
-            case 'deepStringify': {
+            case 'deepStringifyFunctions': {
               // Pass-through to the shared utility from `smbls`
-              return deepStringify(...args)
+              return deepStringifyFunctions(...args)
             }
             default:
               return {}
@@ -137,73 +136,65 @@ export class CollabService extends BaseService {
       await this.disconnect()
     }
 
-    try {
-      this._client = new CollabClient({
-        jwt,
-        projectId,
-        branch,
-        live: Boolean(pro)
-      })
-
-      // Mark as connected once the socket establishes a connection. This prevents
-      // the SDK from being stuck waiting for an initial snapshot that may never
-      // arrive (e.g. for new/empty documents).
-      await new Promise((resolve) => {
-        if (this._client.socket?.connected) {
-          resolve()
-        } else {
-          this._client.socket?.once('connect', resolve)
-        }
-      })
-
-      console.log('[CollabService] socket connected')
+    this._client = new CollabClient({
+      jwt,
+      projectId,
+      branch,
+      live: Boolean(pro)
+    })
 
-      // Set up event listeners
-      this._client.socket?.on('ops', ({ changes }) => {
-        console.log(`ops event`)
-        console.log(changes)
-        this._stateManager.applyChanges(changes, { fromSocket: true })
-      })
+    // Mark as connected once the socket establishes a connection. This prevents
+    // the SDK from being stuck waiting for an initial snapshot that may never
+    // arrive (e.g. for new/empty documents).
+    await new Promise((resolve) => {
+      if (this._client.socket?.connected) {
+        resolve()
+      } else {
+        this._client.socket?.once('connect', resolve)
+      }
+    })
 
-      this._client.socket?.on('commit', ({ version }) => {
-        if (version) {
-          this._stateManager.setVersion(version)
-        }
+    // Set up event listeners
+    this._client.socket?.on('ops', ({ changes }) => {
+      console.log(`ops event`)
+      this._stateManager.applyChanges(changes, { fromSocket: true })
+    })
 
-        // Inform UI about automatic commit
-        rootBus.emit('checkpoint:done', { version, origin: 'auto' })
-      })
+    this._client.socket?.on('commit', ({ version }) => {
+      if (version) {
+        this._stateManager.setVersion(version)
+      }
 
-      // 🔄  Presence / members / cursor updates
-      this._client.socket?.on('clients', this._handleClientsEvent.bind(this))
+      // Inform UI about automatic commit
+      rootBus.emit('checkpoint:done', { version, origin: 'auto' })
+    })
 
-      // 🗜️  Bundle events – emitted by the dependency bundler service
-      this._client.socket?.on(
-        'bundle:done',
-        this._handleBundleDoneEvent.bind(this)
-      )
-      this._client.socket?.on(
-        'bundle:error',
-        this._handleBundleErrorEvent.bind(this)
+    // 🔄  Presence / members / cursor updates
+    this._client.socket?.on('clients', this._handleClientsEvent.bind(this))
+
+    // 🗜️  Bundle events – emitted by the dependency bundler service
+    this._client.socket?.on(
+      'bundle:done',
+      this._handleBundleDoneEvent.bind(this)
+    )
+    this._client.socket?.on(
+      'bundle:error',
+      this._handleBundleErrorEvent.bind(this)
+    )
+
+    // Flush any operations that were queued while we were offline.
+    if (this._pendingOps.length) {
+      console.log(
+        `[CollabService] Flushing ${this._pendingOps.length} offline operation batch(es)`
       )
-
-      // Flush any operations that were queued while we were offline.
-      if (this._pendingOps.length) {
-        console.log(
-          `[CollabService] Flushing ${this._pendingOps.length} offline operation batch(es)`
-        )
-        this._pendingOps.forEach(({ tuples }) => {
-          this.socket.emit('ops', { changes: tuples, ts: Date.now() })
-        })
-        this._pendingOps.length = 0
-      }
-
-      this._connected = true
-      console.log('[CollabService] Connected to project:', projectId)
-    } catch (err) {
-      console.error('[CollabService] Connection failed:', err)
-      throw err
+      this._pendingOps.forEach(({ changes, granularChanges, orders }) => {
+        this.socket.emit('ops', { changes, granularChanges, orders, ts: Date.now() })
+      })
+      this._pendingOps.length = 0
     }
+
+    this._connected = true
+    // console.log('[CollabService] Connected to project:', projectId)
   }
 
   disconnect() {
@@ -249,26 +240,72 @@ export class CollabService extends BaseService {
       this._trackForUndo(tuples, options)
     }
 
+    // Preprocess into granular changes and derive orders
+    const root = this._stateManager?.root
+    const { granularChanges: processedTuples, orders } = preprocessChanges(
+      root,
+      tuples,
+      options
+    )
+
     // Include any additional changes passed via opts
     if (options.append && options.append.length) {
-      tuples.push(...options.append)
+      processedTuples.push(...options.append)
     }
 
     // Apply changes to local state tree immediately.
     this._stateManager.applyChanges(tuples, { ...options })
 
-    tuples = deepStringify(tuples, [])
+    const state = this._stateManager?.root
+    const el = state?.__element
+
+    // orders already derived by preprocessor
+
+    const stringifiedGranularTuples = el?.call
+      ? el.call(
+          'deepStringifyFunctions',
+          processedTuples,
+          Array.isArray(processedTuples) ? [] : {}
+        )
+      : deepStringifyFunctions(
+          processedTuples,
+          Array.isArray(processedTuples) ? [] : {}
+        )
+
+    const stringifiedTuples = el?.call
+      ? el.call(
+          'deepStringifyFunctions',
+          tuples,
+          Array.isArray(tuples) ? [] : {}
+        )
+      : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {})
 
     // If not connected yet, queue the operations for later synchronisation.
     if (!this.isConnected()) {
       console.warn('[CollabService] Not connected, queuing real-time update')
-      this._pendingOps.push({ tuples, options })
+      this._pendingOps.push({
+        changes: stringifiedTuples,
+        granularChanges: stringifiedGranularTuples,
+        orders,
+        options
+      })
       return
     }
 
     // When connected, send the operations to the backend.
     if (this.socket?.connected) {
-      this.socket.emit('ops', { changes: tuples, ts: Date.now() })
+      console.log('[CollabService] Sending operations to the backend', {
+        changes: stringifiedTuples,
+        granularChanges: stringifiedGranularTuples,
+        orders,
+        ts: Date.now()
+      })
+      this.socket.emit('ops', {
+        changes: stringifiedTuples,
+        granularChanges: stringifiedGranularTuples,
+        orders,
+        ts: Date.now()
+      })
     }
 
     return { success: true }
@@ -446,7 +483,7 @@ export class CollabService extends BaseService {
 
       return this.updateData(tuples, updatedOpts)
     } catch (error) {
-      throw new Error(`Failed to add item: ${error.message}`)
+      throw new Error(`Failed to add item: ${error.message}`, { cause: error })
     }
   }
 
@@ -479,7 +516,7 @@ export class CollabService extends BaseService {
         title: 'Failed to add item',
         message: error.message
       })
-      throw new Error(`Failed to add item: ${error.message}`)
+      throw new Error(`Failed to add item: ${error.message}`, { cause: error })
     }
   }
 
@@ -502,7 +539,9 @@ export class CollabService extends BaseService {
         title: 'Failed to update item',
         message: error.message
       })
-      throw new Error(`Failed to update item: ${error.message}`)
+      throw new Error(`Failed to update item: ${error.message}`, {
+        cause: error
+      })
     }
   }
 
@@ -528,7 +567,9 @@ export class CollabService extends BaseService {
         title: 'Failed to delete item',
         message: error.message
       })
-      throw new Error(`Failed to delete item: ${error.message}`)
+      throw new Error(`Failed to delete item: ${error.message}`, {
+        cause: error
+      })
     }
   }
 

package/src/services/CoreService.js

@@ -186,12 +186,12 @@ export class CoreService extends BaseService {
         } catch {
           // Use default error message
         }
-        throw new Error(error.message || error.error || 'Request failed')
+        throw new Error(error.message || error.error || 'Request failed', { cause: error })
       }
 
       return response.status === 204 ? null : response.json()
     } catch (error) {
-      throw new Error(`Request failed: ${error.message}`)
+      throw new Error(`Request failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -209,7 +209,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Registration failed: ${error.message}`)
+      throw new Error(`Registration failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -245,7 +245,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Login failed: ${error.message}`)
+      throw new Error(`Login failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -270,7 +270,7 @@ export class CoreService extends BaseService {
       }
       this.updateContext({ authToken: null })
 
-      throw new Error(`Logout failed: ${error.message}`)
+      throw new Error(`Logout failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -286,7 +286,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Token refresh failed: ${error.message}`)
+      throw new Error(`Token refresh failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -325,7 +325,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Google auth failed: ${error.message}`)
+      throw new Error(`Google auth failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -364,7 +364,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`GitHub auth failed: ${error.message}`)
+      throw new Error(`GitHub auth failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -405,7 +405,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Google auth callback failed: ${error.message}`)
+      throw new Error(`Google auth callback failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -421,7 +421,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Password reset request failed: ${error.message}`)
+      throw new Error(`Password reset request failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -437,7 +437,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Password reset confirmation failed: ${error.message}`)
+      throw new Error(`Password reset confirmation failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -453,7 +453,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Registration confirmation failed: ${error.message}`)
+      throw new Error(`Registration confirmation failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -469,7 +469,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Password change request failed: ${error.message}`)
+      throw new Error(`Password change request failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -486,7 +486,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Password change confirmation failed: ${error.message}`)
+      throw new Error(`Password change confirmation failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -502,7 +502,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get user profile: ${error.message}`)
+      throw new Error(`Failed to get user profile: ${error.message}`, { cause: error })
     }
   }
 
@@ -643,7 +643,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to update user profile: ${error.message}`)
+      throw new Error(`Failed to update user profile: ${error.message}`, { cause: error })
     }
   }
 
@@ -667,7 +667,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get user projects: ${error.message}`)
+      throw new Error(`Failed to get user projects: ${error.message}`, { cause: error })
     }
   }
 
@@ -686,7 +686,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get user: ${error.message}`)
+      throw new Error(`Failed to get user: ${error.message}`, { cause: error })
     }
   }
 
@@ -705,7 +705,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get user by email: ${error.message}`)
+      throw new Error(`Failed to get user by email: ${error.message}`, { cause: error })
     }
   }
 

package/src/services/DnsService.js

@@ -19,7 +19,7 @@ export class DnsService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to create DNS record: ${error.message}`)
+      throw new Error(`Failed to create DNS record: ${error.message}`, { cause: error })
     }
   }
 
@@ -38,7 +38,7 @@ export class DnsService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get DNS record: ${error.message}`)
+      throw new Error(`Failed to get DNS record: ${error.message}`, { cause: error })
     }
   }
 
@@ -76,7 +76,7 @@ export class DnsService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to remove DNS record: ${error.message}`)
+      throw new Error(`Failed to remove DNS record: ${error.message}`, { cause: error })
     }
   }
 
@@ -105,7 +105,7 @@ export class DnsService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to set project domains: ${error.message}`)
+      throw new Error(`Failed to set project domains: ${error.message}`, { cause: error })
     }
   }
 

package/src/services/FileService.js

@@ -45,7 +45,7 @@ export class FileService extends BaseService {
         message: response.message
       }
     } catch (error) {
-      throw new Error(`File upload failed: ${error.message}`)
+      throw new Error(`File upload failed: ${error.message}`, { cause: error })
     }
   }
 
@@ -71,7 +71,7 @@ export class FileService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to update project icon: ${error.message}`)
+      throw new Error(`Failed to update project icon: ${error.message}`, { cause: error })
     }
   }
 

package/src/services/PaymentService.js

@@ -34,7 +34,7 @@ export class PaymentService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to checkout: ${error.message}`)
+      throw new Error(`Failed to checkout: ${error.message}`, { cause: error })
     }
   }
 
@@ -56,7 +56,7 @@ export class PaymentService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get subscription status: ${error.message}`)
+      throw new Error(`Failed to get subscription status: ${error.message}`, { cause: error })
     }
   }
 

package/src/services/PlanService.js

@@ -17,7 +17,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get plans: ${error.message}`)
+      throw new Error(`Failed to get plans: ${error.message}`, { cause: error })
     }
   }
 
@@ -38,7 +38,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get plan: ${error.message}`)
+      throw new Error(`Failed to get plan: ${error.message}`, { cause: error })
     }
   }
 
@@ -59,7 +59,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to get admin plans: ${error.message}`)
+      throw new Error(`Failed to get admin plans: ${error.message}`, { cause: error })
     }
   }
 
@@ -82,7 +82,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to create plan: ${error.message}`)
+      throw new Error(`Failed to create plan: ${error.message}`, { cause: error })
     }
   }
 
@@ -108,7 +108,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to update plan: ${error.message}`)
+      throw new Error(`Failed to update plan: ${error.message}`, { cause: error })
     }
   }
 
@@ -130,7 +130,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to delete plan: ${error.message}`)
+      throw new Error(`Failed to delete plan: ${error.message}`, { cause: error })
     }
   }
 
@@ -149,7 +149,7 @@ export class PlanService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Failed to initialize plans: ${error.message}`)
+      throw new Error(`Failed to initialize plans: ${error.message}`, { cause: error })
     }
   }
 
@@ -166,7 +166,7 @@ export class PlanService extends BaseService {
       }
       return plans
     } catch (error) {
-      throw new Error(`Failed to get plans with validation: ${error.message}`)
+      throw new Error(`Failed to get plans with validation: ${error.message}`, { cause: error })
     }
   }
 
@@ -185,7 +185,7 @@ export class PlanService extends BaseService {
       }
       return plan
     } catch (error) {
-      throw new Error(`Failed to get plan with validation: ${error.message}`)
+      throw new Error(`Failed to get plan with validation: ${error.message}`, { cause: error })
     }
   }
 
@@ -252,7 +252,7 @@ export class PlanService extends BaseService {
       const plans = await this.getPlans()
       return plans.filter(plan => plan.active !== false)
     } catch (error) {
-      throw new Error(`Failed to get active plans: ${error.message}`)
+      throw new Error(`Failed to get active plans: ${error.message}`, { cause: error })
     }
   }
 
@@ -267,7 +267,7 @@ export class PlanService extends BaseService {
         return price >= minPrice && price <= maxPrice
       })
     } catch (error) {
-      throw new Error(`Failed to get plans by price range: ${error.message}`)
+      throw new Error(`Failed to get plans by price range: ${error.message}`, { cause: error })
     }
   }
 
@@ -289,7 +289,7 @@ export class PlanService extends BaseService {
 
       return plan
     } catch (error) {
-      throw new Error(`Failed to get plan by key: ${error.message}`)
+      throw new Error(`Failed to get plan by key: ${error.message}`, { cause: error })
     }
   }
 }