@symbo.ls/sdk 2.32.30 → 2.33.2

package/dist/cjs/services/CollabService.js

@@ -27,6 +27,31 @@ var import_rootEventBus = require("../state/rootEventBus.js");
 var import_validation = require("../utils/validation.js");
 var import_utils = require("@domql/utils");
 var import_changePreprocessor = require("../utils/changePreprocessor.js");
+const FUNCTION_META_KEYS = ["node", "__ref", "__element", "parent", "parse"];
+function stringifyFunctionsForTransport(value, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value === null || typeof value !== "object") {
+    return typeof value === "function" ? value.toString() : value;
+  }
+  if (seen.has(value)) {
+    return seen.get(value);
+  }
+  const clone = Array.isArray(value) ? [] : {};
+  seen.set(value, clone);
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      clone[i] = stringifyFunctionsForTransport(value[i], seen);
+    }
+    return clone;
+  }
+  const keys = Object.keys(value);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value[key], seen);
+    }
+  }
+  return clone;
+}
 class CollabService extends import_BaseService.BaseService {
   constructor(config) {
     super(config);
@@ -335,7 +360,7 @@ class CollabService extends import_BaseService.BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a, _b, _c;
+    var _a, _b;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
@@ -351,21 +376,10 @@ class CollabService extends import_BaseService.BaseService {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    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) ? [] : {}
-    ) : (0, import_utils.deepStringifyFunctions)(
-      processedTuples,
-      Array.isArray(processedTuples) ? [] : {}
+    const stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
     );
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      tuples,
-      Array.isArray(tuples) ? [] : {}
-    ) : (0, import_utils.deepStringifyFunctions)(tuples, Array.isArray(tuples) ? [] : {});
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples);
     const { message } = options;
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
@@ -377,7 +391,7 @@ class CollabService extends import_BaseService.BaseService {
       });
       return;
     }
-    if ((_c = this.socket) == null ? void 0 : _c.connected) {
+    if ((_b = this.socket) == null ? void 0 : _b.connected) {
       const ts = Date.now();
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,

package/dist/cjs/utils/ordering.js

@@ -167,14 +167,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -259,12 +259,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);

package/dist/esm/index.js

@@ -42782,14 +42782,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t4;
     const p3 = normalizePath(path);
-    if (!Array.isArray(p3) || p3.length < 3) {
+    if (!Array.isArray(p3) || p3.length < 2) {
       continue;
     }
     if (p3[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p3;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p3.slice(0, -1);
+    const childKey = p3[p3.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -42874,12 +42874,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k3);
     if (pending && pending.size) {
-      const existing = new Set(v3.keys);
+      const existingKeys = v3.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j3 = 0; j3 < existingKeys.length; j3++) {
+        if (META_KEYS.has(existingKeys[j3])) {
+          firstMetaIndex = j3;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v3.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k3);
@@ -43066,6 +43101,31 @@ function preprocessChanges(root, tuples = [], options = {}) {
 }
 
 // src/services/CollabService.js
+var FUNCTION_META_KEYS = ["node", "__ref", "__element", "parent", "parse"];
+function stringifyFunctionsForTransport(value2, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value2 === null || typeof value2 !== "object") {
+    return typeof value2 === "function" ? value2.toString() : value2;
+  }
+  if (seen.has(value2)) {
+    return seen.get(value2);
+  }
+  const clone = Array.isArray(value2) ? [] : {};
+  seen.set(value2, clone);
+  if (Array.isArray(value2)) {
+    for (let i3 = 0; i3 < value2.length; i3++) {
+      clone[i3] = stringifyFunctionsForTransport(value2[i3], seen);
+    }
+    return clone;
+  }
+  const keys2 = Object.keys(value2);
+  for (let i3 = 0; i3 < keys2.length; i3++) {
+    const key = keys2[i3];
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value2[key], seen);
+    }
+  }
+  return clone;
+}
 var CollabService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -43374,7 +43434,7 @@ var CollabService = class extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a2, _b, _c;
+    var _a2, _b;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
@@ -43390,21 +43450,10 @@ var CollabService = class extends BaseService {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    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 stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
     );
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      tuples,
-      Array.isArray(tuples) ? [] : {}
-    ) : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {});
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples);
     const { message } = options;
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
@@ -43416,7 +43465,7 @@ var CollabService = class extends BaseService {
       });
       return;
     }
-    if ((_c = this.socket) == null ? void 0 : _c.connected) {
+    if ((_b = this.socket) == null ? void 0 : _b.connected) {
       const ts = Date.now();
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,

package/dist/esm/services/CollabService.js

@@ -24857,14 +24857,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -24949,12 +24949,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);
@@ -25141,6 +25176,31 @@ function preprocessChanges(root, tuples = [], options = {}) {
 }
 
 // src/services/CollabService.js
+var FUNCTION_META_KEYS = ["node", "__ref", "__element", "parent", "parse"];
+function stringifyFunctionsForTransport(value2, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value2 === null || typeof value2 !== "object") {
+    return typeof value2 === "function" ? value2.toString() : value2;
+  }
+  if (seen.has(value2)) {
+    return seen.get(value2);
+  }
+  const clone = Array.isArray(value2) ? [] : {};
+  seen.set(value2, clone);
+  if (Array.isArray(value2)) {
+    for (let i = 0; i < value2.length; i++) {
+      clone[i] = stringifyFunctionsForTransport(value2[i], seen);
+    }
+    return clone;
+  }
+  const keys2 = Object.keys(value2);
+  for (let i = 0; i < keys2.length; i++) {
+    const key = keys2[i];
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value2[key], seen);
+    }
+  }
+  return clone;
+}
 var CollabService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -25449,7 +25509,7 @@ var CollabService = class extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a, _b, _c;
+    var _a, _b;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
@@ -25465,21 +25525,10 @@ var CollabService = class extends BaseService {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    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 stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
     );
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      tuples,
-      Array.isArray(tuples) ? [] : {}
-    ) : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {});
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples);
     const { message } = options;
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
@@ -25491,7 +25540,7 @@ var CollabService = class extends BaseService {
       });
       return;
     }
-    if ((_c = this.socket) == null ? void 0 : _c.connected) {
+    if ((_b = this.socket) == null ? void 0 : _b.connected) {
       const ts = Date.now();
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,

package/dist/esm/services/ProjectService.js

@@ -926,14 +926,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -1018,12 +1018,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);

package/dist/esm/services/index.js

@@ -42782,14 +42782,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t4;
     const p3 = normalizePath(path);
-    if (!Array.isArray(p3) || p3.length < 3) {
+    if (!Array.isArray(p3) || p3.length < 2) {
       continue;
     }
     if (p3[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p3;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p3.slice(0, -1);
+    const childKey = p3[p3.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -42874,12 +42874,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k3);
     if (pending && pending.size) {
-      const existing = new Set(v3.keys);
+      const existingKeys = v3.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j3 = 0; j3 < existingKeys.length; j3++) {
+        if (META_KEYS.has(existingKeys[j3])) {
+          firstMetaIndex = j3;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v3.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k3);
@@ -43066,6 +43101,31 @@ function preprocessChanges(root, tuples = [], options = {}) {
 }
 
 // src/services/CollabService.js
+var FUNCTION_META_KEYS = ["node", "__ref", "__element", "parent", "parse"];
+function stringifyFunctionsForTransport(value2, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value2 === null || typeof value2 !== "object") {
+    return typeof value2 === "function" ? value2.toString() : value2;
+  }
+  if (seen.has(value2)) {
+    return seen.get(value2);
+  }
+  const clone = Array.isArray(value2) ? [] : {};
+  seen.set(value2, clone);
+  if (Array.isArray(value2)) {
+    for (let i3 = 0; i3 < value2.length; i3++) {
+      clone[i3] = stringifyFunctionsForTransport(value2[i3], seen);
+    }
+    return clone;
+  }
+  const keys2 = Object.keys(value2);
+  for (let i3 = 0; i3 < keys2.length; i3++) {
+    const key = keys2[i3];
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value2[key], seen);
+    }
+  }
+  return clone;
+}
 var CollabService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -43374,7 +43434,7 @@ var CollabService = class extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a2, _b, _c;
+    var _a2, _b;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
@@ -43390,21 +43450,10 @@ var CollabService = class extends BaseService {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    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 stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
     );
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      tuples,
-      Array.isArray(tuples) ? [] : {}
-    ) : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {});
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples);
     const { message } = options;
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
@@ -43416,7 +43465,7 @@ var CollabService = class extends BaseService {
       });
       return;
     }
-    if ((_c = this.socket) == null ? void 0 : _c.connected) {
+    if ((_b = this.socket) == null ? void 0 : _b.connected) {
       const ts = Date.now();
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,

package/dist/esm/utils/changePreprocessor.js

@@ -220,14 +220,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -312,12 +312,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);

package/dist/esm/utils/ordering.js

@@ -144,14 +144,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -236,12 +236,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);

package/dist/node/services/CollabService.js

@@ -5,6 +5,31 @@ import { rootBus } from "../state/rootEventBus.js";
 import { validateParams } from "../utils/validation.js";
 import { deepStringifyFunctions } from "@domql/utils";
 import { preprocessChanges } from "../utils/changePreprocessor.js";
+const FUNCTION_META_KEYS = ["node", "__ref", "__element", "parent", "parse"];
+function stringifyFunctionsForTransport(value, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value === null || typeof value !== "object") {
+    return typeof value === "function" ? value.toString() : value;
+  }
+  if (seen.has(value)) {
+    return seen.get(value);
+  }
+  const clone = Array.isArray(value) ? [] : {};
+  seen.set(value, clone);
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      clone[i] = stringifyFunctionsForTransport(value[i], seen);
+    }
+    return clone;
+  }
+  const keys = Object.keys(value);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value[key], seen);
+    }
+  }
+  return clone;
+}
 class CollabService extends BaseService {
   constructor(config) {
     super(config);
@@ -313,7 +338,7 @@ class CollabService extends BaseService {
   }
   /* ---------- data helpers ---------- */
   updateData(tuples, options = {}) {
-    var _a, _b, _c;
+    var _a, _b;
     this._ensureStateManager();
     const { isUndo = false, isRedo = false } = options;
     if (!isUndo && !isRedo && !this._isUndoRedo) {
@@ -329,21 +354,10 @@ class CollabService extends BaseService {
       processedTuples.push(...options.append);
     }
     this._stateManager.applyChanges(tuples, { ...options });
-    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 stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
     );
-    const stringifiedTuples = (el == null ? void 0 : el.call) ? el.call(
-      "deepStringifyFunctions",
-      tuples,
-      Array.isArray(tuples) ? [] : {}
-    ) : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {});
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples);
     const { message } = options;
     if (!this.isConnected()) {
       console.warn("[CollabService] Not connected, queuing real-time update");
@@ -355,7 +369,7 @@ class CollabService extends BaseService {
       });
       return;
     }
-    if ((_c = this.socket) == null ? void 0 : _c.connected) {
+    if ((_b = this.socket) == null ? void 0 : _b.connected) {
       const ts = Date.now();
       console.log("[CollabService] Sending operations to the backend", {
         changes: stringifiedTuples,

package/dist/node/utils/ordering.js

@@ -143,14 +143,14 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const [action, path] = t;
     const p = normalizePath(path);
-    if (!Array.isArray(p) || p.length < 3) {
+    if (!Array.isArray(p) || p.length < 2) {
       continue;
     }
     if (p[0] === "schema") {
       continue;
     }
-    const [typeName, containerKey, childKey] = p;
-    const containerPath = [typeName, containerKey];
+    const containerPath = p.slice(0, -1);
+    const childKey = p[p.length - 1];
     const key = JSON.stringify(containerPath);
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, /* @__PURE__ */ new Set());
@@ -235,12 +235,47 @@ function computeOrdersForTuples(root, tuples = []) {
     }
     const pending = pendingChildrenByContainer.get(k);
     if (pending && pending.size) {
-      const existing = new Set(v.keys);
+      const existingKeys = v.keys;
+      const existingSet = new Set(existingKeys);
+      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"
+      ]);
+      let firstMetaIndex = existingKeys.length;
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j;
+          break;
+        }
+      }
       for (const child of pending) {
-        if (existing.has(child)) {
+        if (existingSet.has(child)) {
           continue;
         }
-        v.keys.push(child);
+        const insertIndex = firstMetaIndex;
+        existingKeys.splice(insertIndex, 0, child);
+        existingSet.add(child);
+        firstMetaIndex++;
       }
     }
     seen.add(k);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/sdk",
-  "version": "2.32.30",
+  "version": "2.33.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -46,12 +46,12 @@
     "test:user": "cross-env NODE_ENV=$NODE_ENV npx tape integration-tests/index.js integration-tests/user/*.test.js | tap-spec"
   },
   "dependencies": {
-    "@domql/element": "^2.32.30",
-    "@domql/utils": "^2.32.30",
+    "@domql/element": "^2.33.2",
+    "@domql/utils": "^2.33.2",
     "@grafana/faro-web-sdk": "^1.19.0",
     "@grafana/faro-web-tracing": "^1.19.0",
-    "@symbo.ls/router": "^2.32.30",
-    "@symbo.ls/socket": "^2.32.30",
+    "@symbo.ls/router": "^2.33.2",
+    "@symbo.ls/socket": "^2.33.2",
     "acorn": "^8.14.0",
     "acorn-walk": "^8.3.4",
     "dexie": "^4.0.11",
@@ -73,5 +73,5 @@
     "tap-spec": "^5.0.0",
     "tape": "^5.9.0"
   },
-  "gitHead": "1f4b829d823a7b42486c0e8f7dca5660bf466c19"
+  "gitHead": "57240a2eaa9945f0e889bd40005e331b602c467b"
 }

package/src/services/CollabService.js

@@ -6,6 +6,41 @@ import { validateParams } from '../utils/validation.js'
 import { deepStringifyFunctions } from '@domql/utils'
 import { preprocessChanges } from '../utils/changePreprocessor.js'
 
+// Helper: clone a value while converting all functions to strings. This is
+// tailored for collab payloads (tuples / granularChanges) and is more robust
+// for nested array shapes than the generic DOMQL helper.
+const FUNCTION_META_KEYS = ['node', '__ref', '__element', 'parent', 'parse']
+
+function stringifyFunctionsForTransport (value, seen = new WeakMap()) {
+  if (value === null || typeof value !== 'object') {
+    return typeof value === 'function' ? value.toString() : value
+  }
+
+  if (seen.has(value)) {
+    return seen.get(value)
+  }
+
+  const clone = Array.isArray(value) ? [] : {}
+  seen.set(value, clone)
+
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      clone[i] = stringifyFunctionsForTransport(value[i], seen)
+    }
+    return clone
+  }
+
+  const keys = Object.keys(value)
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i]
+    if (!FUNCTION_META_KEYS.includes(key)) {
+      clone[key] = stringifyFunctionsForTransport(value[key], seen)
+    }
+  }
+
+  return clone
+}
+
 export class CollabService extends BaseService {
   constructor(config) {
     super(config)
@@ -410,29 +445,13 @@ export class CollabService extends BaseService {
     // Apply changes to local state tree immediately.
     this._stateManager.applyChanges(tuples, { ...options })
 
-    const state = this._stateManager?.root
-    const el = state?.__element
-
-    // orders already derived by preprocessor
-
-    const stringifiedGranularTuples = el?.call
-      ? el.call(
-          'deepStringifyFunctions',
-          processedTuples,
-          Array.isArray(processedTuples) ? [] : {}
-        )
-      : deepStringifyFunctions(
-          processedTuples,
-          Array.isArray(processedTuples) ? [] : {}
-        )
+    // Use a dedicated helper that correctly handles nested array structures
+    // such as granular tuples while also avoiding DOM / state metadata keys.
+    const stringifiedGranularTuples = stringifyFunctionsForTransport(
+      processedTuples
+    )
 
-    const stringifiedTuples = el?.call
-      ? el.call(
-          'deepStringifyFunctions',
-          tuples,
-          Array.isArray(tuples) ? [] : {}
-        )
-      : deepStringifyFunctions(tuples, Array.isArray(tuples) ? [] : {})
+    const stringifiedTuples = stringifyFunctionsForTransport(tuples)
 
     const { message } = options
 

package/src/utils/ordering.js

@@ -125,20 +125,24 @@ function extractTopLevelKeysFromCode (code) {
 
 export function computeOrdersForTuples (root, tuples = []) {
   // Pre-scan tuples to collect child keys that will be added/updated for each
-  // data container (e.g. ['pages', '/']). This lets us include keys created in
-  // the same batch even if they are not yet present in the state object when
-  // we compute orders.
+  // container object. This lets us include keys created in the same batch even
+  // if they are not yet present in the state object when we compute orders.
   const pendingChildrenByContainer = 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 (!Array.isArray(p) || p.length < 2) { continue }
     // Ignore schema edits here – we want actual data container child keys
     if (p[0] === 'schema') { continue }
-    const [typeName, containerKey, childKey] = p
-    const containerPath = [typeName, containerKey]
+
+    // Treat the immediate parent as the container and the final segment as the
+    // child key, regardless of depth. This ensures nested containers such as
+    // ['components', 'Comp1', 'MainContent', 'TXButton'] correctly record
+    // 'TXButton' as a child of ['components', 'Comp1', 'MainContent'].
+    const containerPath = p.slice(0, -1)
+    const childKey = p[p.length - 1]
     const key = JSON.stringify(containerPath)
     if (!pendingChildrenByContainer.has(key)) {
       pendingChildrenByContainer.set(key, new Set())
@@ -228,10 +232,33 @@ export function computeOrdersForTuples (root, tuples = []) {
     // Merge in any pending children (for containers without schema edits)
     const pending = pendingChildrenByContainer.get(k)
     if (pending && pending.size) {
-      const existing = new Set(v.keys)
+      const existingKeys = v.keys
+      const existingSet = new Set(existingKeys)
+
+      // Meta keys such as 'props' and 'text' should typically stay at the end
+      // of the order. When inserting brand-new children we try to place them
+      // before the first meta key so that structural children appear first.
+      const META_KEYS = new Set([
+        'style', 'class', 'text', 'html', 'content', 'data', 'attr', 'state', 'scope',
+        'define', 'on', 'extend', 'extends', 'childExtend', 'childExtends',
+        'children', 'component', 'context', 'tag', 'key', '__order', 'if'
+      ])
+
+      let firstMetaIndex = existingKeys.length
+      for (let j = 0; j < existingKeys.length; j++) {
+        if (META_KEYS.has(existingKeys[j])) {
+          firstMetaIndex = j
+          break
+        }
+      }
+
       for (const child of pending) {
-        if (existing.has(child)) { continue }
-        v.keys.push(child)
+        if (existingSet.has(child)) { continue }
+        const insertIndex = firstMetaIndex
+        existingKeys.splice(insertIndex, 0, child)
+        existingSet.add(child)
+        // Keep subsequent new children grouped together in front of meta keys
+        firstMetaIndex++
       }
     }
     seen.add(k)