@symbo.ls/sdk 2.32.1 → 2.32.4

package/dist/esm/utils/changePreprocessor.js

@@ -0,0 +1,442 @@
+// src/utils/jsonDiff.js
+function isPlainObject(o) {
+  return o && typeof o === "object" && !Array.isArray(o);
+}
+function deepEqual(a, b) {
+  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 diffJson(prev, next, prefix = []) {
+  const ops = [];
+  const _prefix = Array.isArray(prefix) ? prefix : [];
+  for (const key in prev) {
+    if (Object.hasOwn(prev, key) && !(key in next)) {
+      ops.push({ action: "del", path: [..._prefix, key] });
+    }
+  }
+  for (const key in next) {
+    if (Object.hasOwn(next, key)) {
+      const pVal = prev == null ? void 0 : prev[key];
+      const nVal = next[key];
+      if (isPlainObject(pVal) && isPlainObject(nVal)) {
+        ops.push(...diffJson(pVal, nVal, [..._prefix, key]));
+      } else if (!deepEqual(pVal, nVal)) {
+        ops.push({ action: "set", path: [..._prefix, key], value: nVal });
+      }
+    }
+  }
+  return ops;
+}
+
+// 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 last = path[path.length - 1];
+    if (META_KEYS.has(last) && 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 keys = Object.keys(obj).filter((k) => !EXCLUDE_KEYS.has(k));
+    orders.push({ path: parentPath, keys });
+  }
+  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, value] = 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 = value && Array.isArray(value.uses) ? value.uses : null;
+    const code = value && value.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, value] = 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(value);
+    if (!canConsiderExpansion) {
+      return [t];
+    }
+    const prev = getByPathSafe(root, path) || {};
+    const next = value || {};
+    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 last = fullPath[fullPath.length - 1];
+      if (op.action === "set") {
+        out.push(["update", fullPath, op.value]);
+      } else if (op.action === "del") {
+        if (last !== "__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, value] = t;
+    if (action !== "update" || !Array.isArray(path) || path.length !== 1 && path.length !== 2 || !isPlainObject2(value)) {
+      continue;
+    }
+    const keys = Object.keys(value).filter((k) => k !== "__order");
+    const key = JSON.stringify(path);
+    preferOrdersMap.set(key, { path, keys });
+  }
+  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 };
+}
+export {
+  preprocessChanges
+};

package/dist/esm/utils/jsonDiff.js

@@ -6025,12 +6025,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");

package/dist/esm/utils/ordering.js

@@ -24,14 +24,12 @@ function getParentPathsFromTuples(tuples = []) {
     "attr",
     "state",
     "scope",
-    "props",
     "define",
     "on",
     "extend",
     "extends",
     "childExtend",
     "childExtends",
-    "childProps",
     "children",
     "component",
     "context",

package/dist/node/services/CollabService.js

@@ -4,8 +4,7 @@ import { RootStateManager } from "../state/RootStateManager.js";
 import { rootBus } from "../state/rootEventBus.js";
 import { validateParams } from "../utils/validation.js";
 import { deepStringifyFunctions } from "@domql/utils";
-import { diffJson } from "../utils/jsonDiff.js";
-import { computeOrdersForTuples } from "../utils/ordering.js";
+import { preprocessChanges } from "../utils/changePreprocessor.js";
 class CollabService extends BaseService {
   constructor(config) {
     super(config);
@@ -142,8 +141,8 @@ class CollabService 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(({ changes, granularChanges, orders }) => {
+        this.socket.emit("ops", { changes, granularChanges, orders, ts: Date.now() });
       });
       this._pendingOps.length = 0;
     }
@@ -185,94 +184,24 @@ class CollabService extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     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 isPlainObject = (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, 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") {
-              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];
-              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;
-      }
-    })();
+    const root = (_a = this._stateManager) == null ? void 0 : _a.root;
+    const { granularChanges: processedTuples, orders } = preprocessChanges(
+      root,
+      tuples,
+      options
+    );
     if (options.append && options.append.length) {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    const state = (_a = this._stateManager) == null ? void 0 : _a.root;
+    const state = (_b = this._stateManager) == null ? void 0 : _b.root;
     const el = state == null ? void 0 : state.__element;
-    const orders = computeOrdersForTuples(state, processedTuples);
     const stringifiedGranularTuples = (el == null ? void 0 : el.call) ? el.call(
       "deepStringifyFunctions",
       processedTuples,
@@ -285,16 +214,18 @@ class CollabService extends BaseService {
       "deepStringifyFunctions",
       tuples,
       Array.isArray(tuples) ? [] : {}
-    ) : 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({ changes: stringifiedTuples, granularChanges: stringifiedGranularTuples, orders, options });
+      this._pendingOps.push({
+        changes: stringifiedTuples,
+        granularChanges: stringifiedGranularTuples,
+        orders,
+        options
+      });
       return;
     }
-    if ((_b = this.socket) == null ? void 0 : _b.connected) {
+    if ((_c = this.socket) == null ? void 0 : _c.connected) {
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,
         granularChanges: stringifiedGranularTuples,

package/dist/node/services/ProjectService.js

@@ -1,5 +1,7 @@
 import { BaseService } from "./BaseService.js";
 import { computeOrdersForTuples } from "../utils/ordering.js";
+import { preprocessChanges } from "../utils/changePreprocessor.js";
+import { deepStringifyFunctions } from "@domql/utils";
 class ProjectService extends BaseService {
   // ==================== PROJECT METHODS ====================
   async createProject(projectData) {
@@ -532,12 +534,15 @@ class ProjectService extends BaseService {
     }
     const { message, branch = "main", type = "patch" } = options;
     const state = this._context && this._context.state;
-    const derivedOrders = options.orders || (state ? computeOrdersForTuples(state, changes) : []);
+    const { granularChanges, orders: preprocessorOrders } = preprocessChanges(state, changes, options);
+    const derivedOrders = options.orders || (preprocessorOrders && preprocessorOrders.length ? preprocessorOrders : state ? computeOrdersForTuples(state, granularChanges) : []);
+    const stringify = (val) => deepStringifyFunctions(val, Array.isArray(val) ? [] : {});
     try {
       const response = await this._request(`/projects/${projectId}/changes`, {
         method: "POST",
         body: JSON.stringify({
-          changes,
+          changes: stringify(changes),
+          granularChanges: stringify(granularChanges),
           message,
           branch,
           type,