@vuer-ai/vuer-rtc 0.0.3 → 0.0.4

package/dist/operations/apply/object.d.ts

@@ -9,6 +9,8 @@ import type { OpMeta } from './types.js';
 export declare function ObjectSet(draft: SceneGraph, op: ObjectSetOp, meta: OpMeta): void;
 /**
  * object.merge - Deep merge objects
+ *
+ * If path is "." or undefined, merge directly into the node (node root level)
  */
 export declare function ObjectMerge(draft: SceneGraph, op: ObjectMergeOp, meta: OpMeta): void;
 //# sourceMappingURL=object.d.ts.map

package/dist/operations/apply/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../src/operations/apply/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,MAAM,GACX,IAAI,CAIN;AA8BD;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,MAAM,GACX,IAAI,CAMN"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../src/operations/apply/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,MAAM,GACX,IAAI,CAIN;AA8BD;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,MAAM,GACX,IAAI,CAmBN"}

package/dist/operations/apply/object.js

@@ -35,13 +35,28 @@ function deepMerge(target, source) {
 }
 /**
  * object.merge - Deep merge objects
+ *
+ * If path is "." or undefined, merge directly into the node (node root level)
  */
 export function ObjectMerge(draft, op, meta) {
     const node = draft.nodes[op.key];
     if (!node || node.deletedAt)
         return;
-    const current = getNodeProperty(node, op.path, {});
-    const merged = deepMerge(current, op.value);
-    setNodeProperty(node, op.path, merged, meta);
+    if (op.path === '.' || op.path === undefined) {
+        // Merge directly into node root
+        for (const [key, value] of Object.entries(op.value)) {
+            // Skip internal fields
+            if (['key', 'tag', 'children', 'clock', 'lamportTime', 'createdAt', 'updatedAt', 'deletedAt'].includes(key)) {
+                continue;
+            }
+            node[key] = value;
+        }
+        node.updatedAt = meta.timestamp;
+    }
+    else {
+        const current = getNodeProperty(node, op.path, {});
+        const merged = deepMerge(current, op.value);
+        setNodeProperty(node, op.path, merged, meta);
+    }
 }
 //# sourceMappingURL=object.js.map

package/dist/operations/apply/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/operations/apply/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAElF;;GAEG;AACH,MAAM,UAAU,SAAS,CACvB,KAAiB,EACjB,EAAe,EACf,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS;QAAE,OAAO;IACpC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,MAA+B,EAAE,MAA+B;IACjF,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE9B,IACE,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACzB,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACzB,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CACrB,SAAoC,EACpC,SAAoC,CACrC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,KAAiB,EACjB,EAAiB,EACjB,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS;QAAE,OAAO;IACpC,MAAM,OAAO,GAAG,eAAe,CAA0B,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAC5C,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/operations/apply/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAElF;;GAEG;AACH,MAAM,UAAU,SAAS,CACvB,KAAiB,EACjB,EAAe,EACf,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS;QAAE,OAAO;IACpC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,MAA+B,EAAE,MAA+B;IACjF,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE9B,IACE,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACzB,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACzB,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CACrB,SAAoC,EACpC,SAAoC,CACrC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CACzB,KAAiB,EACjB,EAAiB,EACjB,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS;QAAE,OAAO;IAEpC,IAAI,EAAE,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7C,gCAAgC;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;YACpD,uBAAuB;YACvB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5G,SAAS;YACX,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACpB,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,eAAe,CAA0B,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAC5C,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuer-ai/vuer-rtc",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "description": "CRDT-based real-time collaborative data structures",
   "main": "dist/index.js",

package/src/operations/apply/object.ts

@@ -49,6 +49,8 @@ function deepMerge(target: Record<string, unknown>, source: Record<string, unkno
 
 /**
  * object.merge - Deep merge objects
+ *
+ * If path is "." or undefined, merge directly into the node (node root level)
  */
 export function ObjectMerge(
   draft: SceneGraph,
@@ -57,7 +59,20 @@ export function ObjectMerge(
 ): void {
   const node = draft.nodes[op.key];
   if (!node || node.deletedAt) return;
-  const current = getNodeProperty<Record<string, unknown>>(node, op.path, {});
-  const merged = deepMerge(current, op.value);
-  setNodeProperty(node, op.path, merged, meta);
+
+  if (op.path === '.' || op.path === undefined) {
+    // Merge directly into node root
+    for (const [key, value] of Object.entries(op.value)) {
+      // Skip internal fields
+      if (['key', 'tag', 'children', 'clock', 'lamportTime', 'createdAt', 'updatedAt', 'deletedAt'].includes(key)) {
+        continue;
+      }
+      node[key] = value;
+    }
+    node.updatedAt = meta.timestamp;
+  } else {
+    const current = getNodeProperty<Record<string, unknown>>(node, op.path, {});
+    const merged = deepMerge(current, op.value);
+    setNodeProperty(node, op.path, merged, meta);
+  }
 }

package/tests/operations/unified-schema.test.ts

@@ -0,0 +1,304 @@
+/**
+ * Tests for unified operation schema:
+ * - key field targeting specific nodes (defaults to "." for root)
+ * - path: "." for node root level operations
+ * - Cross-node operations in single message
+ */
+
+import { describe, it, expect, beforeEach } from '@jest/globals';
+import { createEmptyGraph, applyMessage } from '../../src/index.js';
+import type { SceneGraph, CRDTMessage, Operation } from '../../src/operations/OperationTypes.js';
+
+function createMsg(ops: Operation | Operation[], lamport = 1): CRDTMessage {
+  return {
+    id: `msg-${Math.random().toString(36).slice(2)}`,
+    sessionId: 'test-session',
+    clock: { 'test-session': lamport },
+    lamportTime: lamport,
+    timestamp: Date.now(),
+    ops: Array.isArray(ops) ? ops : [ops],
+  };
+}
+
+function setupGraph(): SceneGraph {
+  let graph = createEmptyGraph();
+
+  // Insert root scene
+  graph = applyMessage(
+    graph,
+    createMsg({
+      key: '',
+      otype: 'node.insert',
+      path: 'children',
+      value: { key: 'scene', tag: 'Scene', name: 'Root Scene' },
+    }, 1)
+  );
+
+  // Insert two child nodes
+  graph = applyMessage(
+    graph,
+    createMsg({
+      key: 'scene',
+      otype: 'node.insert',
+      path: 'children',
+      value: {
+        key: 'box-1',
+        tag: 'Mesh',
+        name: 'Box 1',
+        position: [0, 0, 0],
+        visible: true,
+        metadata: { author: 'user-1' },
+      },
+    }, 2)
+  );
+
+  graph = applyMessage(
+    graph,
+    createMsg({
+      key: 'scene',
+      otype: 'node.insert',
+      path: 'children',
+      value: {
+        key: 'box-2',
+        tag: 'Mesh',
+        name: 'Box 2',
+        position: [5, 0, 0],
+        visible: false,
+        metadata: { author: 'user-2' },
+      },
+    }, 3)
+  );
+
+  return graph;
+}
+
+describe('Unified Schema: Key Field', () => {
+  let graph: SceneGraph;
+
+  beforeEach(() => {
+    graph = setupGraph();
+  });
+
+  it('should target specific node with key', () => {
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'vector3.set',
+      path: 'position',
+      value: [10, 20, 30],
+    };
+    // Use lamportTime > 3 (nodes were created at lamport 1, 2, 3)
+    const result = applyMessage(graph, createMsg(op, 10));
+
+    expect(result.nodes['box-1'].position).toEqual([10, 20, 30]);
+    expect(result.nodes['box-2'].position).toEqual([5, 0, 0]); // unchanged
+  });
+
+  it('should use empty string key for root insertion', () => {
+    const newGraph = createEmptyGraph();
+    const op: Operation = {
+      key: '',
+      otype: 'node.insert',
+      path: 'children',
+      value: { key: 'new-root', tag: 'Scene', name: 'New Root' },
+    };
+    const result = applyMessage(newGraph, createMsg(op));
+
+    expect(result.nodes['new-root']).toBeDefined();
+    expect(result.rootKey).toBe('new-root');
+  });
+
+  it('should apply operations to different nodes in sequence', () => {
+    // Move box-1 up
+    graph = applyMessage(
+      graph,
+      createMsg({
+        key: 'box-1',
+        otype: 'vector3.add',
+        path: 'position',
+        value: [0, 5, 0],
+      }, 4)
+    );
+
+    // Move box-2 right
+    graph = applyMessage(
+      graph,
+      createMsg({
+        key: 'box-2',
+        otype: 'vector3.add',
+        path: 'position',
+        value: [5, 0, 0],
+      }, 5)
+    );
+
+    expect(graph.nodes['box-1'].position).toEqual([0, 5, 0]);
+    expect(graph.nodes['box-2'].position).toEqual([10, 0, 0]);
+  });
+});
+
+describe('Unified Schema: Path Field', () => {
+  let graph: SceneGraph;
+
+  beforeEach(() => {
+    graph = setupGraph();
+  });
+
+  it('should merge at node root with path: "."', () => {
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'object.merge',
+      path: '.',
+      value: { castShadow: true, receiveShadow: true },
+    };
+    const result = applyMessage(graph, createMsg(op, 10));
+
+    expect(result.nodes['box-1'].castShadow).toBe(true);
+    expect(result.nodes['box-1'].receiveShadow).toBe(true);
+    expect(result.nodes['box-1'].name).toBe('Box 1'); // preserved
+    expect(result.nodes['box-1'].position).toEqual([0, 0, 0]); // preserved
+  });
+
+  it('should set nested property with dot path', () => {
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'object.merge',
+      path: 'metadata',
+      value: { version: 2, modified: true },
+    };
+    const result = applyMessage(graph, createMsg(op));
+
+    expect(result.nodes['box-1'].metadata).toEqual({
+      author: 'user-1',
+      version: 2,
+      modified: true,
+    });
+  });
+
+  it('should set property directly with path', () => {
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'boolean.set',
+      path: 'visible',
+      value: false,
+    };
+    const result = applyMessage(graph, createMsg(op, 10));
+
+    expect(result.nodes['box-1'].visible).toBe(false);
+  });
+});
+
+describe('Unified Schema: Batch Operations', () => {
+  let graph: SceneGraph;
+
+  beforeEach(() => {
+    graph = setupGraph();
+  });
+
+  it('should apply multiple operations in single message', () => {
+    const ops: Operation[] = [
+      { key: 'box-1', otype: 'vector3.set', path: 'position', value: [1, 1, 1] },
+      { key: 'box-2', otype: 'vector3.set', path: 'position', value: [2, 2, 2] },
+      { key: 'box-1', otype: 'boolean.set', path: 'visible', value: false },
+      { key: 'box-2', otype: 'boolean.set', path: 'visible', value: true },
+    ];
+    const result = applyMessage(graph, createMsg(ops, 4));
+
+    expect(result.nodes['box-1'].position).toEqual([1, 1, 1]);
+    expect(result.nodes['box-2'].position).toEqual([2, 2, 2]);
+    expect(result.nodes['box-1'].visible).toBe(false);
+    expect(result.nodes['box-2'].visible).toBe(true);
+  });
+
+  it('should apply additive operations across nodes', () => {
+    const ops: Operation[] = [
+      { key: 'box-1', otype: 'vector3.add', path: 'position', value: [1, 0, 0] },
+      { key: 'box-1', otype: 'vector3.add', path: 'position', value: [0, 1, 0] },
+      { key: 'box-2', otype: 'vector3.add', path: 'position', value: [0, 0, 1] },
+    ];
+    const result = applyMessage(graph, createMsg(ops, 4));
+
+    expect(result.nodes['box-1'].position).toEqual([1, 1, 0]);
+    expect(result.nodes['box-2'].position).toEqual([5, 0, 1]);
+  });
+
+  it('should handle insert and update in same message', () => {
+    const ops: Operation[] = [
+      {
+        key: 'scene',
+        otype: 'node.insert',
+        path: 'children',
+        value: { key: 'box-3', tag: 'Mesh', name: 'Box 3', position: [0, 0, 0] },
+      },
+      { key: 'box-3', otype: 'vector3.set', path: 'position', value: [10, 10, 10] },
+    ];
+    const result = applyMessage(graph, createMsg(ops, 4));
+
+    expect(result.nodes['box-3']).toBeDefined();
+    expect(result.nodes['box-3'].position).toEqual([10, 10, 10]);
+  });
+});
+
+describe('Unified Schema: Type-specific Operations on Nodes', () => {
+  let graph: SceneGraph;
+
+  beforeEach(() => {
+    graph = setupGraph();
+  });
+
+  it('should apply number operations to node properties', () => {
+    // Add scale property first
+    graph = applyMessage(
+      graph,
+      createMsg({
+        key: 'box-1',
+        otype: 'object.merge',
+        path: '.',
+        value: { opacity: 1.0 },
+      }, 4)
+    );
+
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'number.multiply',
+      path: 'opacity',
+      value: 0.5,
+    };
+    const result = applyMessage(graph, createMsg(op, 5));
+
+    expect(result.nodes['box-1'].opacity).toBe(0.5);
+  });
+
+  it('should apply string operations to node properties', () => {
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'string.concat',
+      path: 'name',
+      value: ' (modified)',
+    };
+    const result = applyMessage(graph, createMsg(op, 4));
+
+    expect(result.nodes['box-1'].name).toBe('Box 1 (modified)');
+  });
+
+  it('should apply array operations to node properties', () => {
+    // Add tags property first via object.set on a specific property
+    graph = applyMessage(
+      graph,
+      createMsg({
+        key: 'box-1',
+        otype: 'array.set',
+        path: 'tags',
+        value: ['mesh'],
+      }, 10)
+    );
+
+    const op: Operation = {
+      key: 'box-1',
+      otype: 'array.push',
+      path: 'tags',
+      value: 'selectable',
+    };
+    const result = applyMessage(graph, createMsg(op, 11));
+
+    expect(result.nodes['box-1'].tags).toEqual(['mesh', 'selectable']);
+  });
+});