@symbo.ls/sdk 2.32.0 → 2.32.2

package/dist/esm/services/CollabService.js

@@ -14111,28 +14111,18 @@ var CONFIG = {
     // For based api
     basedOrg: "symbols",
     // For based api
-    githubClientId: "Ov23liAFrsR0StbAO6PO",
+    githubClientId: "Ov23liHxyWFBxS8f1gnF",
     // 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",
-    typesenseCollectionName: "docs",
-    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
-    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
-    typesensePort: "443",
-    typesenseProtocol: "https"
+    githubClientId: "Ov23liHxyWFBxS8f1gnF"
   },
   testing: {
     socketUrl: "https://test.api.symbols.app",
@@ -14140,22 +14130,12 @@ var CONFIG = {
     basedEnv: "testing",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23liHxyWFBxS8f1gnF",
-    typesenseCollectionName: "docs",
-    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
-    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
-    typesensePort: "443",
-    typesenseProtocol: "https"
+    githubClientId: "Ov23liHxyWFBxS8f1gnF"
   },
   upcoming: {
     socketUrl: "https://upcoming.api.symbols.app",
     apiUrl: "https://upcoming.api.symbols.app",
-    githubClientId: "Ov23liWF7NvdZ056RV5J",
-    typesenseCollectionName: "docs",
-    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
-    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
-    typesensePort: "443",
-    typesenseProtocol: "https"
+    githubClientId: "Ov23liWF7NvdZ056RV5J"
   },
   staging: {
     socketUrl: "https://staging.api.symbols.app",
@@ -14163,12 +14143,7 @@ var CONFIG = {
     basedEnv: "staging",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23ligwZDQVD0VfuWNa",
-    typesenseCollectionName: "docs",
-    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
-    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
-    typesensePort: "443",
-    typesenseProtocol: "https"
+    githubClientId: "Ov23ligwZDQVD0VfuWNa"
   },
   production: {
     socketUrl: "https://api.symbols.app",
@@ -14176,12 +14151,7 @@ var CONFIG = {
     basedEnv: "production",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
-    githubClientId: "Ov23liFAlOEIXtX3dBtR",
-    typesenseCollectionName: "docs",
-    typesenseApiKey: "awmcVpbWqZi9IUgmvslp1C5LKDU8tMjA",
-    typesenseHost: "tl2qpnwxev4cjm36p-1.a1.typesense.net",
-    typesensePort: "443",
-    typesenseProtocol: "https"
+    githubClientId: "Ov23liFAlOEIXtX3dBtR"
   }
 };
 var getEnvironment = () => {
@@ -14203,11 +14173,6 @@ 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",
@@ -14227,7 +14192,7 @@ var getConfig = () => {
       );
     }
     if (finalConfig.isDevelopment) {
-      console.warn(
+      console.log(
         "environment in SDK:",
         env || process.env.NODE_ENV || process.env.NODE_ENV
       );
@@ -14266,7 +14231,7 @@ var TokenManager = class {
     });
     this.config = {
       storagePrefix: "symbols_",
-      storageType: typeof window === "undefined" || process.env.NODE_ENV === "test" || process.env.NODE_ENV === "testing" ? "memory" : "localStorage",
+      storageType: typeof window === "undefined" || process.env.NODE_ENV === "test" ? "memory" : "localStorage",
       // 'localStorage' | 'sessionStorage' | 'memory'
       refreshBuffer: 60 * 1e3,
       // Refresh 1 minute before expiry
@@ -14306,26 +14271,15 @@ var TokenManager = class {
     if (typeof window === "undefined") {
       return this._memoryStorage;
     }
-    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);
+    const hasLocalStorage = typeof window.localStorage !== "undefined";
+    const hasSessionStorage = typeof window.sessionStorage !== "undefined";
     switch (this.config.storageType) {
       case "sessionStorage":
-        return sessionStorageInstance || this._memoryStorage;
+        return hasSessionStorage ? window.sessionStorage : this._memoryStorage;
       case "memory":
         return this._memoryStorage;
       default:
-        return localStorageInstance || this._memoryStorage;
+        return hasLocalStorage ? window.localStorage : this._memoryStorage;
     }
   }
   /**
@@ -14664,10 +14618,20 @@ 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);
@@ -14676,9 +14640,7 @@ var BaseService = class {
   }
   // Update context
   updateContext(context) {
-    if (context && typeof context === "object") {
-      Object.assign(this._context, context);
-    }
+    this._context = { ...this._context, ...context };
   }
   // Get service status
   getStatus() {
@@ -14733,6 +14695,11 @@ 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, {
@@ -14750,11 +14717,11 @@ var BaseService = class {
           error = await response.json();
         } catch {
         }
-        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}`);
     }
   }
   // Helper method to determine if a method requires initialization
@@ -24554,282 +24521,7 @@ var validateParams = {
 };
 
 // src/services/CollabService.js
-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",
-    "props",
-    "define",
-    "on",
-    "extend",
-    "extends",
-    "childExtend",
-    "childExtends",
-    "childProps",
-    "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 extractTopLevelKeysFromCode(code) {
-  const src = normaliseSchemaCode(code);
-  if (!src) {
-    return [];
-  }
-  const idx = src.indexOf("export default");
-  if (idx === -1) {
-    return [];
-  }
-  let i = src.indexOf("{", idx);
-  if (i === -1) {
-    return [];
-  }
-  const keys2 = [];
-  let depth = 0;
-  let inStr = false;
-  let strCh = "";
-  let inEsc = false;
-  for (; i < src.length; i++) {
-    const ch = src[i];
-    if (inStr) {
-      if (inEsc) {
-        inEsc = false;
-      } else if (ch === "\\") {
-        inEsc = true;
-      } else if (ch === strCh) {
-        inStr = false;
-        strCh = "";
-      }
-      continue;
-    }
-    if (ch === '"' || ch === "'" || ch === "`") {
-      inStr = true;
-      strCh = ch;
-      continue;
-    }
-    if (ch === "{") {
-      depth++;
-      continue;
-    }
-    if (ch === "}") {
-      depth--;
-      if (depth === 0) {
-        break;
-      }
-      continue;
-    }
-    if (depth !== 1) {
-      continue;
-    }
-    if (/[A-Za-z_$]/u.test(ch)) {
-      let j = i;
-      while (j < src.length && /[A-Za-z0-9_$]/u.test(src[j])) {
-        j++;
-      }
-      let k = j;
-      while (k < src.length && /\s/u.test(src[k])) {
-        k++;
-      }
-      if (src[k] === ":") {
-        const key = src.slice(i, j);
-        keys2.push(key);
-      }
-      i = j;
-      continue;
-    }
-  }
-  if (!keys2.length) {
-    const bodyStart = src.indexOf("{", idx);
-    const bodyEnd = src.lastIndexOf("}");
-    if (bodyStart === -1 || bodyEnd === -1 || bodyEnd <= bodyStart) {
-      return Array.from(new Set(keys2));
-    }
-    const body = src.slice(bodyStart + 1, bodyEnd);
-    const re2 = /(?:[A-Za-z_$][A-Za-z0-9_$]*|"[^"]+"|'[^']+')\s*:/gu;
-    for (const m of body.matchAll(re2)) {
-      const raw = m[0].split(":")[0].trim();
-      const key = raw[0] === '"' || raw[0] === "'" ? raw.slice(1, -1) : raw;
-      keys2.push(key);
-    }
-  }
-  return Array.from(new Set(keys2));
-}
-function computeOrdersForTuples(root, tuples = []) {
-  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 = [];
-    if (Array.isArray(codeKeys) && codeKeys.length) {
-      resolved = codeKeys.filter((k) => present.has(k) && !EXCLUDE_KEYS.has(k));
-    }
-    if (resolved.length && Array.isArray(uses) && uses.length) {
-      for (let u = 0; u < uses.length; u++) {
-        const keyName = uses[u];
-        if (present.has(keyName) && !EXCLUDE_KEYS.has(keyName) && !resolved.includes(keyName)) {
-          resolved.push(keyName);
-        }
-      }
-    }
-    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)) {
-      seen.add(k);
-      orders.push(v);
-    }
-  }
-  return orders;
-}
-
-// src/services/CollabService.js
+import { deepStringify } from "@domql/utils";
 var CollabService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -24893,8 +24585,8 @@ var CollabService = class extends BaseService {
               logger(`[Notification] ${title}${message ? ` \u2013 ${message}` : ""}`);
               return;
             }
-            case "deepStringifyFunctions": {
-              return deepStringifyFunctions(...args2);
+            case "deepStringify": {
+              return deepStringify(...args2);
             }
             default:
               return {};
@@ -24944,8 +24636,10 @@ var CollabService = class extends BaseService {
           (_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 }) => {
@@ -24967,13 +24661,15 @@ var CollabService = class extends BaseService {
         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() });
+        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;
     }
   }
@@ -25013,118 +24709,24 @@ var CollabService = class extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a, _b;
+    var _a;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
       this._trackForUndo(tuples, options);
     }
-    const processedTuples = (() => {
-      var _a2;
-      try {
-        const root = (_a2 = this._stateManager) == null ? void 0 : _a2.root;
-        const isPlainObject2 = (o) => o && typeof o === "object" && !Array.isArray(o);
-        const getByPath = (state2, path) => {
-          if (!state2 || typeof state2.getByPath !== "function") {
-            return null;
-          }
-          try {
-            return state2.getByPath(path);
-          } catch {
-            return null;
-          }
-        };
-        const expandTuple = (t) => {
-          const [action, path, value2] = 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) && isPlainObject2(value2);
-          if (!canConsiderExpansion) {
-            return [t];
-          }
-          const prev = getByPath(root, path) || {};
-          const next = value2 || {};
-          if (!isPlainObject2(prev) || !isPlainObject2(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 last2 = fullPath[fullPath.length - 1];
-            if (op.action === "set") {
-              arr.push(["update", fullPath, op.value]);
-            } else if (op.action === "del") {
-              if (last2 !== "__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];
-              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 \u2013 using original tuples",
-          err
-        );
-        return tuples;
-      }
-    })();
     if (options.append && options.append.length) {
-      processedTuples.push(...options.append);
+      tuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    const state = (_a = this._stateManager) == null ? void 0 : _a.root;
-    const el = state == null ? void 0 : state.__element;
-    const orders = computeOrdersForTuples(state, processedTuples);
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      processedTuples,
-      Array.isArray(processedTuples) ? [] : {}
-    ) : deepStringifyFunctions(
-      processedTuples,
-      Array.isArray(processedTuples) ? [] : {}
-    );
+    tuples = deepStringify(tuples, []);
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
-      this._pendingOps.push({ changes: stringifiedTuples, orders, options });
+      this._pendingOps.push({ tuples, options });
       return;
     }
-    if ((_b = this.socket) == null ? void 0 : _b.connected) {
-      console.log("[CollabService] Sending operations to the backend", {
-        changes: stringifiedTuples,
-        orders,
-        ts: Date.now()
-      });
-      this.socket.emit("ops", {
-        changes: stringifiedTuples,
-        orders,
-        ts: Date.now()
-      });
+    if ((_a = this.socket) == null ? void 0 : _a.connected) {
+      this.socket.emit("ops", { changes: tuples, ts: Date.now() });
     }
     return { success: true };
   }
@@ -25265,7 +24867,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}`, { cause: error });
+      throw new Error(`Failed to add item: ${error.message}`);
     }
   }
   addMultipleItems(items, opts = {}) {
@@ -25294,7 +24896,7 @@ var CollabService = class 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}`);
     }
   }
   updateItem(type, data2, opts = {}) {
@@ -25316,9 +24918,7 @@ var CollabService = class 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}`);
     }
   }
   deleteItem(type, key, opts = {}) {
@@ -25343,9 +24943,7 @@ var CollabService = class 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}`);
     }
   }
   /* ---------- socket event helpers ---------- */