feat(json-crdt): 🎸 use .map field in obj and vec

Author: streamich

src/json-crdt/codec/structural/verbose/Decoder.ts

@@ -59,9 +59,10 @@ export class Decoder {
   protected cObj(doc: Model, node: types.ObjectJsonCrdtNode): nodes.ObjNode {
     const id = this.cTs(node.id);
     const obj = new nodes.ObjNode(doc, id);
-    const keys = Object.keys(node.keys);
+    const map = node.map;
+    const keys = Object.keys(map);
     for (const key of keys) {
-      const keyNode = node.keys[key];
+      const keyNode = map[key];
       obj.put(key, this.cNode(doc, keyNode).id);
     }
     doc.index.set(id, obj);
@@ -72,10 +73,10 @@ export class Decoder {
     const id = this.cTs(node.id);
     const obj = new nodes.VecNode(doc, id);
     const elements = obj.elements;
-    const components = node.components;
-    const length = components.length;
+    const map = node.map;
+    const length = map.length;
     for (let i = 0; i < length; i++) {
-      const component = components[i];
+      const component = map[i];
       if (!component) elements.push(undefined);
       else elements.push(this.cNode(doc, component).id);
     }

src/json-crdt/codec/structural/verbose/Encoder.ts

@@ -43,31 +43,31 @@ export class Encoder {
   }
 
   public cObj(obj: nodes.ObjNode): types.ObjectJsonCrdtNode {
-    const keys: Record<string, types.JsonCrdtNode> = {};
+    const map: Record<string, types.JsonCrdtNode> = {};
     obj.nodes((node, key) => {
-      keys[key] = this.cNode(node);
+      map[key] = this.cNode(node);
     });
     return {
       type: 'obj',
       id: this.cTs(obj.id),
-      keys,
+      map,
     };
   }
 
   public cVec(obj: nodes.VecNode): types.TupleJsonCrdtNode {
-    const components: types.TupleJsonCrdtNode['components'] = [];
+    const map: types.TupleJsonCrdtNode['map'] = [];
     const elements = obj.elements;
     const length = elements.length;
     const index = this.model.index;
     for (let i = 0; i < length; i++) {
       const element = elements[i];
-      if (element === undefined) components.push(null);
-      else components.push(this.cNode(index.get(element)!));
+      if (element === undefined) map.push(null);
+      else map.push(this.cNode(index.get(element)!));
     }
     return {
       type: 'tup',
       id: this.cTs(obj.id),
-      components,
+      map,
     };
   }
 

src/json-crdt/codec/structural/verbose/types.ts

@@ -51,7 +51,7 @@ export interface ValueJsonCrdtNode {
 export interface ObjectJsonCrdtNode {
   type: 'obj';
   id: JsonCrdtTimestamp;
-  keys: Record<string, JsonCrdtNode>;
+  map: Record<string, JsonCrdtNode>;
 }
 
 /**
@@ -60,7 +60,7 @@ export interface ObjectJsonCrdtNode {
 export interface TupleJsonCrdtNode {
   type: 'tup';
   id: JsonCrdtTimestamp;
-  components: (null | JsonCrdtNode)[];
+  map: (null | JsonCrdtNode)[];
 }
 
 /**