@symbo.ls/sdk 2.32.2 → 2.32.5

package/dist/esm/services/CollabService.js

@@ -14111,18 +14111,28 @@ var CONFIG = {
     // For based api
     basedOrg: "symbols",
     // For based api
-    githubClientId: "Ov23liHxyWFBxS8f1gnF",
+    githubClientId: "Ov23liAFrsR0StbAO6PO",
     // For github api
     // Environment-specific feature toggles (override common)
     features: {
       betaFeatures: true
       // Enable beta features in local dev
-    }
+    },
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "vZya3L2zpq8L6iI5WWMUZJZABvT63VDb",
+    typesenseHost: "localhost",
+    typesensePort: "8108",
+    typesenseProtocol: "http"
   },
   development: {
     socketUrl: "https://dev.api.symbols.app",
     apiUrl: "https://dev.api.symbols.app",
-    githubClientId: "Ov23liHxyWFBxS8f1gnF"
+    githubClientId: "Ov23liHxyWFBxS8f1gnF",
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
+    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
+    typesensePort: "443",
+    typesenseProtocol: "https"
   },
   testing: {
     socketUrl: "https://test.api.symbols.app",
@@ -14130,12 +14140,22 @@ var CONFIG = {
     basedEnv: "testing",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23liHxyWFBxS8f1gnF"
+    githubClientId: "Ov23liHxyWFBxS8f1gnF",
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
+    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
+    typesensePort: "443",
+    typesenseProtocol: "https"
   },
   upcoming: {
     socketUrl: "https://upcoming.api.symbols.app",
     apiUrl: "https://upcoming.api.symbols.app",
-    githubClientId: "Ov23liWF7NvdZ056RV5J"
+    githubClientId: "Ov23liWF7NvdZ056RV5J",
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
+    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
+    typesensePort: "443",
+    typesenseProtocol: "https"
   },
   staging: {
     socketUrl: "https://staging.api.symbols.app",
@@ -14143,7 +14163,12 @@ var CONFIG = {
     basedEnv: "staging",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23ligwZDQVD0VfuWNa"
+    githubClientId: "Ov23ligwZDQVD0VfuWNa",
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
+    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
+    typesensePort: "443",
+    typesenseProtocol: "https"
   },
   production: {
     socketUrl: "https://api.symbols.app",
@@ -14151,7 +14176,12 @@ var CONFIG = {
     basedEnv: "production",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23liFAlOEIXtX3dBtR"
+    githubClientId: "Ov23liFAlOEIXtX3dBtR",
+    typesenseCollectionName: "docs",
+    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
+    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
+    typesensePort: "443",
+    typesenseProtocol: "https"
   }
 };
 var getEnvironment = () => {
@@ -14173,6 +14203,11 @@ var getConfig = () => {
       basedProject: process.env.SYMBOLS_APP_BASED_PROJECT || envConfig.basedProject,
       basedOrg: process.env.SYMBOLS_APP_BASED_ORG || envConfig.basedOrg,
       githubClientId: process.env.SYMBOLS_APP_GITHUB_CLIENT_ID || envConfig.githubClientId,
+      typesenseCollectionName: process.env.TYPESENSE_COLLECTION_NAME || envConfig.typesenseCollectionName,
+      typesenseApiKey: process.env.TYPESENSE_API_KEY || envConfig.typesenseApiKey,
+      typesenseHost: process.env.TYPESENSE_HOST || envConfig.typesenseHost,
+      typesensePort: process.env.TYPESENSE_PORT || envConfig.typesensePort,
+      typesenseProtocol: process.env.TYPESENSE_PROTOCOL || envConfig.typesenseProtocol,
       isDevelopment: isDevelopment(env),
       isTesting: env === "testing",
       isStaging: env === "staging",
@@ -14192,7 +14227,7 @@ var getConfig = () => {
       );
     }
     if (finalConfig.isDevelopment) {
-      console.log(
+      console.warn(
         "environment in SDK:",
         env || process.env.NODE_ENV || process.env.NODE_ENV
       );
@@ -14231,7 +14266,7 @@ var TokenManager = class {
     });
     this.config = {
       storagePrefix: "symbols_",
-      storageType: typeof window === "undefined" || process.env.NODE_ENV === "test" ? "memory" : "localStorage",
+      storageType: typeof window === "undefined" || process.env.NODE_ENV === "test" || process.env.NODE_ENV === "testing" ? "memory" : "localStorage",
       // 'localStorage' | 'sessionStorage' | 'memory'
       refreshBuffer: 60 * 1e3,
       // Refresh 1 minute before expiry
@@ -14271,15 +14306,26 @@ var TokenManager = class {
     if (typeof window === "undefined") {
       return this._memoryStorage;
     }
-    const hasLocalStorage = typeof window.localStorage !== "undefined";
-    const hasSessionStorage = typeof window.sessionStorage !== "undefined";
+    const safeGetStorage = (provider) => {
+      try {
+        const storage = provider();
+        const testKey = `${this.config.storagePrefix}__tm_test__`;
+        storage.setItem(testKey, "1");
+        storage.removeItem(testKey);
+        return storage;
+      } catch {
+        return null;
+      }
+    };
+    const localStorageInstance = safeGetStorage(() => window.localStorage);
+    const sessionStorageInstance = safeGetStorage(() => window.sessionStorage);
     switch (this.config.storageType) {
       case "sessionStorage":
-        return hasSessionStorage ? window.sessionStorage : this._memoryStorage;
+        return sessionStorageInstance || this._memoryStorage;
       case "memory":
         return this._memoryStorage;
       default:
-        return hasLocalStorage ? window.localStorage : this._memoryStorage;
+        return localStorageInstance || this._memoryStorage;
     }
   }
   /**
@@ -14618,20 +14664,10 @@ var BaseService = class {
       }
       this._tokenManager = getTokenManager({
         apiUrl: this._apiUrl,
-        onTokenRefresh: (tokens) => {
-          this.updateContext({ authToken: tokens.accessToken });
-        },
-        onTokenExpired: () => {
-          this.updateContext({ authToken: null });
-        },
         onTokenError: (error) => {
           console.error("Token management error:", error);
         }
       });
-      const { authToken } = this._context;
-      if (authToken && !this._tokenManager.hasTokens()) {
-        this._tokenManager.setTokens({ access_token: authToken });
-      }
       this._setReady();
     } catch (error) {
       this._setError(error);
@@ -14640,7 +14676,9 @@ var BaseService = class {
   }
   // Update context
   updateContext(context) {
-    this._context = { ...this._context, ...context };
+    if (context && typeof context === "object") {
+      Object.assign(this._context, context);
+    }
   }
   // Get service status
   getStatus() {
@@ -14695,11 +14733,6 @@ var BaseService = class {
           error
         );
       }
-    } else if (this._requiresInit(options.methodName)) {
-      const { authToken } = this._context;
-      if (authToken) {
-        defaultHeaders.Authorization = `Bearer ${authToken}`;
-      }
     }
     try {
       const response = await fetch(url2, {
@@ -14717,11 +14750,11 @@ var BaseService = class {
           error = await response.json();
         } catch {
         }
-        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 });
     }
   }
   // Helper method to determine if a method requires initialization
@@ -18137,12 +18170,54 @@ function isPlainObject(o) {
   return o && typeof o === "object" && !Array.isArray(o);
 }
 function deepEqual(a, b) {
-  try {
-    return JSON.stringify(a) === JSON.stringify(b);
-  } catch (err) {
-    console.warn("deepEqual error", err);
+  if (Object.is(a, b)) {
+    return true;
+  }
+  if (typeof a === "function" && typeof b === "function") {
+    try {
+      return a.toString() === b.toString();
+    } catch {
+      return false;
+    }
+  }
+  if (typeof a === "function" || typeof b === "function") {
     return false;
   }
+  if (a instanceof Date && b instanceof Date) {
+    return a.getTime() === b.getTime();
+  }
+  if (a instanceof RegExp && b instanceof RegExp) {
+    return String(a) === String(b);
+  }
+  if (Array.isArray(a) && Array.isArray(b)) {
+    if (a.length !== b.length) {
+      return false;
+    }
+    for (let i = 0; i < a.length; i++) {
+      if (!deepEqual(a[i], b[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (a && b && typeof a === "object" && typeof b === "object") {
+    const aKeys = Object.keys(a);
+    const bKeys = Object.keys(b);
+    if (aKeys.length !== bKeys.length) {
+      return false;
+    }
+    for (let i = 0; i < aKeys.length; i++) {
+      const key = aKeys[i];
+      if (!Object.hasOwn(b, key)) {
+        return false;
+      }
+      if (!deepEqual(a[key], b[key])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return false;
 }
 function getRootMap(ydoc) {
   return ydoc.getMap("root");
@@ -24521,7 +24596,373 @@ var validateParams = {
 };
 
 // src/services/CollabService.js
-import { deepStringify } from "@domql/utils";
+import { deepStringifyFunctions } from "@domql/utils";
+
+// src/utils/ordering.js
+function isObjectLike(val) {
+  return val && typeof val === "object" && !Array.isArray(val);
+}
+function normalizePath(path) {
+  if (Array.isArray(path)) {
+    return path;
+  }
+  if (typeof path === "string") {
+    return [path];
+  }
+  return [];
+}
+function getParentPathsFromTuples(tuples = []) {
+  const seen = /* @__PURE__ */ new Set();
+  const parents = [];
+  const META_KEYS = /* @__PURE__ */ new Set([
+    "style",
+    "class",
+    "text",
+    "html",
+    "content",
+    "data",
+    "attr",
+    "state",
+    "scope",
+    "define",
+    "on",
+    "extend",
+    "extends",
+    "childExtend",
+    "childExtends",
+    "children",
+    "component",
+    "context",
+    "tag",
+    "key",
+    "__order",
+    "if"
+  ]);
+  for (let i = 0; i < tuples.length; i++) {
+    const tuple = tuples[i];
+    if (!Array.isArray(tuple) || tuple.length < 2) {
+      continue;
+    }
+    const path = normalizePath(tuple[1]);
+    if (!path.length) {
+      continue;
+    }
+    if (path[0] === "schema") {
+      continue;
+    }
+    const immediateParent = path.slice(0, -1);
+    if (immediateParent.length) {
+      const key = JSON.stringify(immediateParent);
+      if (!seen.has(key)) {
+        seen.add(key);
+        parents.push(immediateParent);
+      }
+    }
+    const last2 = path[path.length - 1];
+    if (META_KEYS.has(last2) && path.length >= 2) {
+      const containerParent = path.slice(0, -2);
+      if (containerParent.length) {
+        const key2 = JSON.stringify(containerParent);
+        if (!seen.has(key2)) {
+          seen.add(key2);
+          parents.push(containerParent);
+        }
+      }
+    }
+    for (let j = 0; j < path.length; j++) {
+      const seg = path[j];
+      if (!META_KEYS.has(seg)) {
+        continue;
+      }
+      const containerParent2 = path.slice(0, j);
+      if (!containerParent2.length) {
+        continue;
+      }
+      const key3 = JSON.stringify(containerParent2);
+      if (!seen.has(key3)) {
+        seen.add(key3);
+        parents.push(containerParent2);
+      }
+    }
+  }
+  return parents;
+}
+function computeOrdersFromState(root, parentPaths = []) {
+  if (!root || typeof root.getByPath !== "function") {
+    return [];
+  }
+  const orders = [];
+  const EXCLUDE_KEYS = /* @__PURE__ */ new Set(["__order"]);
+  for (let i = 0; i < parentPaths.length; i++) {
+    const parentPath = parentPaths[i];
+    const obj = (() => {
+      try {
+        return root.getByPath(parentPath);
+      } catch {
+        return null;
+      }
+    })();
+    if (!isObjectLike(obj)) {
+      continue;
+    }
+    const keys2 = Object.keys(obj).filter((k) => !EXCLUDE_KEYS.has(k));
+    orders.push({ path: parentPath, keys: keys2 });
+  }
+  return orders;
+}
+function normaliseSchemaCode(code) {
+  if (typeof code !== "string" || !code.length) {
+    return "";
+  }
+  return code.replaceAll("/////n", "\n").replaceAll("/////tilde", "`");
+}
+function parseExportedObject(code) {
+  const src = normaliseSchemaCode(code);
+  if (!src) {
+    return null;
+  }
+  const body = src.replace(/^\s*export\s+default\s*/u, "return ");
+  try {
+    return new Function(body)();
+  } catch {
+    return null;
+  }
+}
+function extractTopLevelKeysFromCode(code) {
+  const obj = parseExportedObject(code);
+  if (!obj || typeof obj !== "object") {
+    return [];
+  }
+  return Object.keys(obj);
+}
+function computeOrdersForTuples(root, tuples = []) {
+  const pendingChildrenByContainer = /* @__PURE__ */ new Map();
+  for (let i = 0; i < tuples.length; i++) {
+    const t = tuples[i];
+    if (!Array.isArray(t)) {
+      continue;
+    }
+    const [action, path] = t;
+    const p = normalizePath(path);
+    if (!Array.isArray(p) || p.length < 3) {
+      continue;
+    }
+    if (p[0] === "schema") {
+      continue;
+    }
+    const [typeName, containerKey, childKey] = p;
+    const containerPath = [typeName, containerKey];
+    const key = JSON.stringify(containerPath);
+    if (!pendingChildrenByContainer.has(key)) {
+      pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
+    }
+    if (action === "update" || action === "set") {
+      pendingChildrenByContainer.get(key).add(childKey);
+    }
+  }
+  const preferredOrderMap = /* @__PURE__ */ new Map();
+  for (let i = 0; i < tuples.length; i++) {
+    const t = tuples[i];
+    if (!Array.isArray(t)) {
+      continue;
+    }
+    const [action, path, value2] = t;
+    const p = normalizePath(path);
+    if (action !== "update" || !Array.isArray(p) || p.length < 3) {
+      continue;
+    }
+    if (p[0] !== "schema") {
+      continue;
+    }
+    const [, type, key] = p;
+    const containerPath = [type, key];
+    const uses = value2 && Array.isArray(value2.uses) ? value2.uses : null;
+    const code = value2 && value2.code;
+    const obj = (() => {
+      try {
+        return root && typeof root.getByPath === "function" ? root.getByPath(containerPath) : null;
+      } catch {
+        return null;
+      }
+    })();
+    if (!obj) {
+      continue;
+    }
+    const present = new Set(Object.keys(obj));
+    const EXCLUDE_KEYS = /* @__PURE__ */ new Set(["__order"]);
+    const codeKeys = extractTopLevelKeysFromCode(code);
+    let resolved = [];
+    const pendingKey = JSON.stringify(containerPath);
+    const pendingChildren = pendingChildrenByContainer.get(pendingKey) || /* @__PURE__ */ new Set();
+    const eligible = /* @__PURE__ */ new Set([...present, ...pendingChildren]);
+    if (Array.isArray(codeKeys) && codeKeys.length) {
+      resolved = codeKeys.filter((k) => eligible.has(k) && !EXCLUDE_KEYS.has(k));
+    }
+    if (Array.isArray(uses) && uses.length) {
+      for (let u = 0; u < uses.length; u++) {
+        const keyName = uses[u];
+        if (eligible.has(keyName) && !EXCLUDE_KEYS.has(keyName) && !resolved.includes(keyName)) {
+          resolved.push(keyName);
+        }
+      }
+    }
+    if (pendingChildren.size) {
+      for (const child of pendingChildren) {
+        if (!EXCLUDE_KEYS.has(child) && !resolved.includes(child)) {
+          resolved.push(child);
+        }
+      }
+    }
+    if (resolved.length) {
+      preferredOrderMap.set(JSON.stringify(containerPath), { path: containerPath, keys: resolved });
+    }
+  }
+  const parents = getParentPathsFromTuples(tuples);
+  const orders = [];
+  const seen = /* @__PURE__ */ new Set();
+  preferredOrderMap.forEach((v) => {
+    const k = JSON.stringify(v.path);
+    if (!seen.has(k)) {
+      seen.add(k);
+      orders.push(v);
+    }
+  });
+  const fallbackOrders = computeOrdersFromState(root, parents);
+  for (let i = 0; i < fallbackOrders.length; i++) {
+    const v = fallbackOrders[i];
+    const k = JSON.stringify(v.path);
+    if (seen.has(k)) {
+      continue;
+    }
+    const pending = pendingChildrenByContainer.get(k);
+    if (pending && pending.size) {
+      const existing = new Set(v.keys);
+      for (const child of pending) {
+        if (existing.has(child)) {
+          continue;
+        }
+        v.keys.push(child);
+      }
+    }
+    seen.add(k);
+    orders.push(v);
+  }
+  return orders;
+}
+
+// src/utils/changePreprocessor.js
+function isPlainObject2(val) {
+  return val && typeof val === "object" && !Array.isArray(val);
+}
+function getByPathSafe(root, path) {
+  if (!root || typeof root.getByPath !== "function") {
+    return null;
+  }
+  try {
+    return root.getByPath(path);
+  } catch {
+    return null;
+  }
+}
+function preprocessChanges(root, tuples = [], options = {}) {
+  const expandTuple = (t) => {
+    const [action, path, value2] = t || [];
+    const isSchemaPath = Array.isArray(path) && path[0] === "schema";
+    if (action === "delete") {
+      return [t];
+    }
+    const canConsiderExpansion = action === "update" && Array.isArray(path) && (path.length === 1 || path.length === 2 || isSchemaPath && path.length === 3) && isPlainObject2(value2);
+    if (!canConsiderExpansion) {
+      return [t];
+    }
+    const prev = getByPathSafe(root, path) || {};
+    const next = value2 || {};
+    if (!isPlainObject2(prev) || !isPlainObject2(next)) {
+      return [t];
+    }
+    const ops = diffJson(prev, next, []);
+    if (!ops.length) {
+      return [t];
+    }
+    const out = [];
+    for (let i = 0; i < ops.length; i++) {
+      const op = ops[i];
+      const fullPath = [...path, ...op.path];
+      const last2 = fullPath[fullPath.length - 1];
+      if (op.action === "set") {
+        out.push(["update", fullPath, op.value]);
+      } else if (op.action === "del") {
+        if (last2 !== "__order") {
+          out.push(["delete", fullPath]);
+        }
+      }
+    }
+    return out;
+  };
+  const minimizeTuples = (input) => {
+    const out = [];
+    const seen2 = /* @__PURE__ */ new Set();
+    for (let i = 0; i < input.length; i++) {
+      const expanded = expandTuple(input[i]);
+      for (let k = 0; k < expanded.length; k++) {
+        const tuple = expanded[k];
+        const isDelete = Array.isArray(tuple) && tuple[0] === "delete";
+        const isOrderKey = isDelete && Array.isArray(tuple[1]) && tuple[1][tuple[1].length - 1] === "__order";
+        if (!isOrderKey) {
+          const key = JSON.stringify(tuple);
+          if (!seen2.has(key)) {
+            seen2.add(key);
+            out.push(tuple);
+          }
+        }
+      }
+    }
+    return out;
+  };
+  const granularChanges = (() => {
+    try {
+      const res = minimizeTuples(tuples);
+      if (options.append && options.append.length) {
+        res.push(...options.append);
+      }
+      return res;
+    } catch {
+      return Array.isArray(tuples) ? tuples.slice() : [];
+    }
+  })();
+  const baseOrders = computeOrdersForTuples(root, granularChanges);
+  const preferOrdersMap = /* @__PURE__ */ new Map();
+  for (let i = 0; i < tuples.length; i++) {
+    const t = tuples[i];
+    if (!Array.isArray(t) || t.length < 3) {
+      continue;
+    }
+    const [action, path, value2] = t;
+    if (action !== "update" || !Array.isArray(path) || path.length !== 1 && path.length !== 2 || !isPlainObject2(value2)) {
+      continue;
+    }
+    const keys2 = Object.keys(value2).filter((k) => k !== "__order");
+    const key = JSON.stringify(path);
+    preferOrdersMap.set(key, { path, keys: keys2 });
+  }
+  const mergedOrders = [];
+  const seen = /* @__PURE__ */ new Set();
+  preferOrdersMap.forEach((v, k) => {
+    seen.add(k);
+    mergedOrders.push(v);
+  });
+  for (let i = 0; i < baseOrders.length; i++) {
+    const v = baseOrders[i];
+    const k = JSON.stringify(v.path);
+    if (!seen.has(k)) {
+      seen.add(k);
+      mergedOrders.push(v);
+    }
+  }
+  return { granularChanges, orders: mergedOrders };
+}
+
+// src/services/CollabService.js
 var CollabService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -24585,8 +25026,8 @@ var CollabService = class extends BaseService {
               logger(`[Notification] ${title}${message ? ` \u2013 ${message}` : ""}`);
               return;
             }
-            case "deepStringify": {
-              return deepStringify(...args2);
+            case "deepStringifyFunctions": {
+              return deepStringifyFunctions(...args2);
             }
             default:
               return {};
@@ -24621,57 +25062,49 @@ var CollabService = class extends BaseService {
     if (this._client) {
       await this.disconnect();
     }
-    try {
-      this._client = new CollabClient({
-        jwt,
-        projectId,
-        branch,
-        live: Boolean(pro)
-      });
-      await new Promise((resolve) => {
-        var _a2, _b2;
-        if ((_a2 = this._client.socket) == null ? void 0 : _a2.connected) {
-          resolve();
-        } else {
-          (_b2 = this._client.socket) == null ? void 0 : _b2.once("connect", resolve);
-        }
-      });
-      console.log("[CollabService] socket connected");
-      (_b = this._client.socket) == null ? void 0 : _b.on("ops", ({ changes }) => {
-        console.log(`ops event`);
-        console.log(changes);
-        this._stateManager.applyChanges(changes, { fromSocket: true });
-      });
-      (_c = this._client.socket) == null ? void 0 : _c.on("commit", ({ version: version2 }) => {
-        if (version2) {
-          this._stateManager.setVersion(version2);
-        }
-        rootBus.emit("checkpoint:done", { version: version2, origin: "auto" });
-      });
-      (_d = this._client.socket) == null ? void 0 : _d.on("clients", this._handleClientsEvent.bind(this));
-      (_e = this._client.socket) == null ? void 0 : _e.on(
-        "bundle:done",
-        this._handleBundleDoneEvent.bind(this)
-      );
-      (_f = this._client.socket) == null ? void 0 : _f.on(
-        "bundle:error",
-        this._handleBundleErrorEvent.bind(this)
-      );
-      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._client = new CollabClient({
+      jwt,
+      projectId,
+      branch,
+      live: Boolean(pro)
+    });
+    await new Promise((resolve) => {
+      var _a2, _b2;
+      if ((_a2 = this._client.socket) == null ? void 0 : _a2.connected) {
+        resolve();
+      } else {
+        (_b2 = this._client.socket) == null ? void 0 : _b2.once("connect", resolve);
       }
-      this._connected = true;
-      console.log("[CollabService] Connected to project:", projectId);
-    } catch (err) {
-      console.error("[CollabService] Connection failed:", err);
-      throw err;
+    });
+    (_b = this._client.socket) == null ? void 0 : _b.on("ops", ({ changes }) => {
+      console.log(`ops event`);
+      this._stateManager.applyChanges(changes, { fromSocket: true });
+    });
+    (_c = this._client.socket) == null ? void 0 : _c.on("commit", ({ version: version2 }) => {
+      if (version2) {
+        this._stateManager.setVersion(version2);
+      }
+      rootBus.emit("checkpoint:done", { version: version2, origin: "auto" });
+    });
+    (_d = this._client.socket) == null ? void 0 : _d.on("clients", this._handleClientsEvent.bind(this));
+    (_e = this._client.socket) == null ? void 0 : _e.on(
+      "bundle:done",
+      this._handleBundleDoneEvent.bind(this)
+    );
+    (_f = this._client.socket) == null ? void 0 : _f.on(
+      "bundle:error",
+      this._handleBundleErrorEvent.bind(this)
+    );
+    if (this._pendingOps.length) {
+      console.log(
+        `[CollabService] Flushing ${this._pendingOps.length} offline operation batch(es)`
+      );
+      this._pendingOps.forEach(({ changes, granularChanges, orders }) => {
+        this.socket.emit("ops", { changes, granularChanges, orders, ts: Date.now() });
+      });
+      this._pendingOps.length = 0;
     }
+    this._connected = true;
   }
   disconnect() {
     var _a;
@@ -24709,24 +25142,60 @@ var CollabService = class extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a;
+    var _a, _b, _c;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
       this._trackForUndo(tuples, options);
     }
+    const root = (_a = this._stateManager) == null ? void 0 : _a.root;
+    const { granularChanges: processedTuples, orders } = preprocessChanges(
+      root,
+      tuples,
+      options
+    );
     if (options.append && options.append.length) {
-      tuples.push(...options.append);
+      processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    tuples = deepStringify(tuples, []);
+    const state = (_b = this._stateManager) == null ? void 0 : _b.root;
+    const el = state == null ? void 0 : state.__element;
+    const stringifiedGranularTuples = (el == null ? void 0 : el.call) ? el.call(
+      "deepStringifyFunctions",
+      processedTuples,
+      Array.isArray(processedTuples) ? [] : {}
+    ) : deepStringifyFunctions(
+      processedTuples,
+      Array.isArray(processedTuples) ? [] : {}
+    );
+    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
+      "deepStringifyFunctions",
+      tuples,
+      Array.isArray(tuples) ? [] : {}
+    ) : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {});
     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;
     }
-    if ((_a = this.socket) == null ? void 0 : _a.connected) {
-      this.socket.emit("ops", { changes: tuples, ts: Date.now() });
+    if ((_c = this.socket) == null ? void 0 : _c.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()
+      });
     }
     return { success: true };
   }
@@ -24867,7 +25336,7 @@ var CollabService = class extends BaseService {
       const updatedOpts = { ...opts, skipComponentsChangedEvent: true };
       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 });
     }
   }
   addMultipleItems(items, opts = {}) {
@@ -24896,7 +25365,7 @@ var CollabService = class 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 });
     }
   }
   updateItem(type, data2, opts = {}) {
@@ -24918,7 +25387,9 @@ var CollabService = class 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
+      });
     }
   }
   deleteItem(type, key, opts = {}) {
@@ -24943,7 +25414,9 @@ var CollabService = class 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
+      });
     }
   }
   /* ---------- socket event helpers ---------- */