@symbo.ls/sdk 2.32.1 → 2.32.2

package/src/services/CollabService.js

@@ -4,9 +4,7 @@ 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 { deepStringifyFunctions } from '@domql/utils'
-import { diffJson } from '../utils/jsonDiff.js'
-import { computeOrdersForTuples } from '../utils/ordering.js'
+import { deepStringify } from '@domql/utils'
 // (helper conversions reserved for future features)
 
 export class CollabService extends BaseService {
@@ -73,7 +71,7 @@ export class CollabService extends BaseService {
     }
 
     // 🌐 Ensure we always have a usable `__element` stub so that calls like
-    // `el.call('openNotification', …)` or `el.call('deepStringifyFunctions', …)` do not
+    // `el.call('openNotification', …)` or `el.call('deepStringify', …)` do not
     // crash in headless / Node.js environments (e.g. integration tests).
     const root = this._stateManager?.root
 
@@ -94,9 +92,9 @@ export class CollabService extends BaseService {
               logger(`[Notification] ${title}${message ? ` – ${message}` : ''}`)
               return
             }
-            case 'deepStringifyFunctions': {
+            case 'deepStringify': {
               // Pass-through to the shared utility from `smbls`
-              return deepStringifyFunctions(...args)
+              return deepStringify(...args)
             }
             default:
               return {}
@@ -139,65 +137,73 @@ export class CollabService extends BaseService {
       await this.disconnect()
     }
 
-    this._client = new CollabClient({
-      jwt,
-      projectId,
-      branch,
-      live: Boolean(pro)
-    })
+    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)
-      }
-    })
+      // 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)
+        }
+      })
 
-    // Set up event listeners
-    this._client.socket?.on('ops', ({ changes }) => {
-      console.log(`ops event`)
-      this._stateManager.applyChanges(changes, { fromSocket: true })
-    })
+      console.log('[CollabService] socket connected')
 
-    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`)
+        console.log(changes)
+        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))
-
-    // 🗜️  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)`
-      )
-      this._pendingOps.forEach(({ changes, orders }) => {
-        this.socket.emit('ops', { changes, orders, ts: Date.now() })
+        // Inform UI about automatic commit
+        rootBus.emit('checkpoint:done', { version, origin: 'auto' })
       })
-      this._pendingOps.length = 0
-    }
 
-    this._connected = true
-    // console.log('[CollabService] Connected to project:', projectId)
+      // 🔄  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)`
+        )
+        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
+    }
   }
 
   disconnect() {
@@ -243,159 +249,26 @@ export class CollabService extends BaseService {
       this._trackForUndo(tuples, options)
     }
 
-    // Minimize broad updates into granular update/delete tuples
-    // Rules:
-    // - Only transform ['update', [<rootKey>, ...], <object>] where <object> is a plain object
-    // - Use current root state at the same path as baseline
-    // - Emit ['delete', path] for missing keys and ['update', path, value] for changed keys
-    // - Preserve non-object updates as-is
-    // - Preserve explicit ['delete', ...] tuples as-is
-    // - Keep schema updates untouched
-    const processedTuples = (() => {
-      try {
-        const root = this._stateManager?.root
-        const isPlainObject = (o) =>
-          o && typeof o === 'object' && !Array.isArray(o)
-
-        const getByPath = (state, path) => {
-          if (!state || typeof state.getByPath !== 'function') {
-            return null
-          }
-          try {
-            return state.getByPath(path)
-          } catch {
-            return null
-          }
-        }
-
-        const expandTuple = (t) => {
-          const [action, path, value] = t || []
-          const isSchemaPath = Array.isArray(path) && path[0] === 'schema'
-          if (action === 'delete' || isSchemaPath) {
-            return [t]
-          }
-          const canConsiderExpansion =
-            action === 'update' &&
-            Array.isArray(path) &&
-            (path.length === 1 || path.length === 2) &&
-            isPlainObject(value)
-          if (!canConsiderExpansion) {
-            return [t]
-          }
-          const prev = getByPath(root, path) || {}
-          const next = value || {}
-          if (!isPlainObject(prev) || !isPlainObject(next)) {
-            return [t]
-          }
-          const ops = diffJson(prev, next, [])
-          if (!ops.length) {
-            return []
-          }
-          const arr = []
-          for (let j = 0; j < ops.length; j++) {
-            const op = ops[j]
-            const fullPath = [...path, ...op.path]
-            const last = fullPath[fullPath.length - 1]
-            if (op.action === 'set') {
-              arr.push(['update', fullPath, op.value])
-            } else if (op.action === 'del') {
-              // Do not generate deletes for __order keys
-              if (last !== '__order') {
-                arr.push(['delete', fullPath])
-              }
-            }
-          }
-          return arr
-        }
-
-        const minimizeTuples = (inputTuples) => {
-          const out = []
-          for (let i = 0; i < inputTuples.length; i++) {
-            const expanded = expandTuple(inputTuples[i])
-            for (let k = 0; k < expanded.length; k++) {
-              const tuple = expanded[k]
-              // Filter out any explicit deletes targeting __order keys
-              const isDelete = Array.isArray(tuple) && tuple[0] === 'delete'
-              const isOrderKey =
-                isDelete &&
-                Array.isArray(tuple[1]) &&
-                tuple[1][tuple[1].length - 1] === '__order'
-              if (!isOrderKey) {
-                out.push(tuple)
-              }
-            }
-          }
-          console.log(`Minimized tuples`, out)
-          return out
-        }
-        console.log(`Processing tuples`, tuples)
-        return minimizeTuples(tuples)
-      } catch (err) {
-        console.warn(
-          '[CollabService] Minimal diff expansion failed – using original tuples',
-          err
-        )
-        return tuples
-      }
-    })()
-
     // Include any additional changes passed via opts
     if (options.append && options.append.length) {
-      processedTuples.push(...options.append)
+      tuples.push(...options.append)
     }
 
     // Apply changes to local state tree immediately.
     this._stateManager.applyChanges(tuples, { ...options })
 
-    const state = this._stateManager?.root
-    const el = state?.__element
-
-    // Derive ordering info for parent objects affected by these tuples
-    const orders = computeOrdersForTuples(state, processedTuples)
-
-    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) ? [] : {}
-        )
+    tuples = deepStringify(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({ changes: stringifiedTuples, granularChanges: stringifiedGranularTuples, orders, options })
+      this._pendingOps.push({ tuples, options })
       return
     }
 
     // When connected, send the operations to the backend.
     if (this.socket?.connected) {
-      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()
-      })
+      this.socket.emit('ops', { changes: tuples, ts: Date.now() })
     }
 
     return { success: true }
@@ -573,7 +446,7 @@ export class CollabService extends BaseService {
 
       return this.updateData(tuples, updatedOpts)
     } catch (error) {
-      throw new Error(`Failed to add item: ${error.message}`, { cause: error })
+      throw new Error(`Failed to add item: ${error.message}`)
     }
   }
 
@@ -606,7 +479,7 @@ export class CollabService extends BaseService {
         title: 'Failed to add item',
         message: error.message
       })
-      throw new Error(`Failed to add item: ${error.message}`, { cause: error })
+      throw new Error(`Failed to add item: ${error.message}`)
     }
   }
 
@@ -629,9 +502,7 @@ export class CollabService extends BaseService {
         title: 'Failed to update item',
         message: error.message
       })
-      throw new Error(`Failed to update item: ${error.message}`, {
-        cause: error
-      })
+      throw new Error(`Failed to update item: ${error.message}`)
     }
   }
 
@@ -657,9 +528,7 @@ export class CollabService extends BaseService {
         title: 'Failed to delete item',
         message: error.message
       })
-      throw new Error(`Failed to delete item: ${error.message}`, {
-        cause: error
-      })
+      throw new Error(`Failed to delete item: ${error.message}`)
     }
   }
 

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', { cause: error })
+        throw new Error(error.message || error.error || 'Request failed')
       }
 
       return response.status === 204 ? null : response.json()
     } catch (error) {
-      throw new Error(`Request failed: ${error.message}`, { cause: error })
+      throw new Error(`Request failed: ${error.message}`)
     }
   }
 
@@ -209,7 +209,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Registration failed: ${error.message}`, { cause: error })
+      throw new Error(`Registration failed: ${error.message}`)
     }
   }
 
@@ -245,7 +245,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Login failed: ${error.message}`, { cause: error })
+      throw new Error(`Login failed: ${error.message}`)
     }
   }
 
@@ -270,7 +270,7 @@ export class CoreService extends BaseService {
       }
       this.updateContext({ authToken: null })
 
-      throw new Error(`Logout failed: ${error.message}`, { cause: error })
+      throw new Error(`Logout failed: ${error.message}`)
     }
   }
 
@@ -286,7 +286,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Token refresh failed: ${error.message}`, { cause: error })
+      throw new Error(`Token refresh failed: ${error.message}`)
     }
   }
 
@@ -325,7 +325,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Google auth failed: ${error.message}`, { cause: error })
+      throw new Error(`Google auth failed: ${error.message}`)
     }
   }
 
@@ -364,7 +364,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`GitHub auth failed: ${error.message}`, { cause: error })
+      throw new Error(`GitHub auth failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Google auth callback failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Password reset request failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Password reset confirmation failed: ${error.message}`)
     }
   }
 
@@ -453,7 +453,7 @@ export class CoreService extends BaseService {
       }
       throw new Error(response.message)
     } catch (error) {
-      throw new Error(`Registration confirmation failed: ${error.message}`, { cause: error })
+      throw new Error(`Registration confirmation failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Password change request failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Password change confirmation failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get user profile: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to update user profile: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get user projects: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get user: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get user by email: ${error.message}`)
     }
   }
 

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}`, { cause: error })
+      throw new Error(`Failed to create DNS record: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get DNS record: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to remove DNS record: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to set project domains: ${error.message}`)
     }
   }
 

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}`, { cause: error })
+      throw new Error(`File upload failed: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to update project icon: ${error.message}`)
     }
   }
 

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}`, { cause: error })
+      throw new Error(`Failed to checkout: ${error.message}`)
     }
   }
 
@@ -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}`, { cause: error })
+      throw new Error(`Failed to get subscription status: ${error.message}`)
     }
   }