refactor(json-crdt): 💡 use ._ as "val" node inner value accessor, instead of .val

Author: streamich

src/json-crdt/__demos__/type-safety.ts

@@ -88,7 +88,7 @@ console.log(model.s.flags[1].$ + '');
 // └─ ValNode 1234.13
 //    └─ ConNode 1234.12 { false }
 
-console.log(model.s.flags[1].val.$ + '');
+console.log(model.s.flags[1]._.$ + '');
 // ConApi
 // └─ ConNode 1234.12 { false }
 

src/json-crdt/model/Model.ts

@@ -258,7 +258,7 @@ export class Model<N extends JsonNode = JsonNode<any>> implements Printable {
    * typed proxy wrapper around the value of the root node.
    */
   public get s() {
-    return this.api.s.val;
+    return this.api.s._;
   }
 
   /**

src/json-crdt/model/api/__tests__/BinaryApi.spec.ts

@@ -33,5 +33,5 @@ test('.length()', () => {
       bin: s.bin(new Uint8Array([1, 2, 3])),
     }),
   );
-  expect(doc.api.s.val.bin.$.length()).toBe(3);
+  expect(doc.api.s._.bin.$.length()).toBe(3);
 });

src/json-crdt/model/api/__tests__/ModelApi.proxy.spec.ts

@@ -23,7 +23,7 @@ test('proxy API supports object types', () => {
     foo: 'asdf',
     bar: 1234,
   });
-  const obj = root.val;
+  const obj = root._;
   const objApi: ObjApi = obj.$;
   expect(objApi).toBeInstanceOf(ObjApi);
   expect(objApi.node).toBeInstanceOf(ObjNode);
@@ -60,7 +60,7 @@ describe('supports all node types', () => {
 
   test('object as root node', () => {
     const proxy = model.api.s;
-    const obj = proxy.val;
+    const obj = proxy._;
     const objApi: ObjApi = obj.$;
     expect(objApi).toBeInstanceOf(ObjApi);
     expect(objApi.node).toBeInstanceOf(ObjNode);
@@ -105,8 +105,8 @@ describe('supports all node types', () => {
   });
 
   test('con - 2', () => {
-    expect((model.s.arr[1] as ProxyNodeVal<ValNode<ConNode<number>>>).val.$).toBeInstanceOf(ConApi);
-    expect((model.s.arr[1] as ProxyNodeVal<ValNode<ConNode<number>>>).val.$.view()).toStrictEqual(0);
+    expect((model.s.arr[1] as ProxyNodeVal<ValNode<ConNode<number>>>)._.$).toBeInstanceOf(ConApi);
+    expect((model.s.arr[1] as ProxyNodeVal<ValNode<ConNode<number>>>)._.$.view()).toStrictEqual(0);
   });
 
   test('con - 3', () => {

src/json-crdt/model/api/__tests__/NodeApi.proxy.spec.ts

@@ -36,7 +36,7 @@ describe('.s', () => {
   });
 
   test('can resolve a "val" node', () => {
-    const str = model.s.val.val.$;
+    const str = model.s.val._.$;
     expect(str.view()).toBe('Hello');
   });
 });

src/json-crdt/model/api/nodes.ts

@@ -394,7 +394,7 @@ export class ValApi<N extends ValNode<any> = ValNode<any>> extends NodeApi<N> {
     const self = this;
     const proxy = {
       $: this,
-      get val() {
+      get _() {
         const childNode = self.node.node();
         return (<any>self).api.wrap(childNode).s;
       },

src/json-crdt/model/api/proxy.ts

@@ -9,7 +9,7 @@ export interface ProxyNode<N extends nodes.JsonNode = nodes.JsonNode> {$: JsonNo
 
 export type ProxyNodeCon<N extends nodes.ConNode<any>> = ProxyNode<N>;
 export type ProxyNodeVal<N extends nodes.ValNode<any>> = ProxyNode<N> & {
-  val: JsonNodeToProxyNode<ReturnType<N['child']>>;
+  _: JsonNodeToProxyNode<ReturnType<N['child']>>;
 };
 export type ProxyNodeVec<N extends nodes.VecNode<any>> = ProxyNode<N> & {
   [K in keyof nodes.JsonNodeView<N>]: JsonNodeToProxyNode<nodes.JsonNodeView<N>[K]>;