feat(json-crdt): 🎸 move .$ getter proxy API to NodeApi class

Author: streamich

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

@@ -0,0 +1,28 @@
+import {Model} from '../../Model';
+import {s} from '../../../../json-crdt-patch';
+
+describe('.$', () => {
+  const model = Model.create(
+    s.obj({
+      obj: s.obj({
+        str: s.str('asdf'),
+        num: s.con(1234),
+        nested: s.json({
+          address: {
+            street: s.str('1st Ave'),
+            city: s.str('New York'),
+          },
+        }),
+      }),
+      vec: s.vec(s.con('asdf'), s.con(1234), s.con(true), s.con(null)),
+      arr: s.arr([s.con('asdf'), s.val(s.con(0))]),
+      bin: s.bin(new Uint8Array([1, 2, 3])),
+    }),
+  );
+
+  test('can use relative path starting from sub-object', () => {
+    const obj = model.$.obj.nested.$;
+    const str = obj?.$.address.city.$;
+    expect(str?.view()).toBe('New York');
+  });
+});

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

@@ -329,6 +329,16 @@ export class NodeApi<N extends JsonNode = JsonNode> implements Printable {
     return {$: this} as unknown as types.ProxyNode<N>;
   }
 
+  public get $(): JsonNodeToProxyPathNode<N> {
+    return proxy$((path) => {
+      try {
+        return this.api.wrap(this.find(path));
+      } catch {
+        return;
+      }
+    }, '$') as any;
+  }
+
   public toString(tab: string = ''): string {
     return 'api' + printTree(tab, [(tab) => this.node.toString(tab)]);
   }
@@ -900,17 +910,6 @@ export class ModelApi<N extends JsonNode = JsonNode> extends ValApi<RootNode<N>>
     } else throw new Error('UNKNOWN_NODE');
   }
 
-  // TODO: Move to node.
-  public get $(): JsonNodeToProxyPathNode<N> {
-    return proxy$((path) => {
-      try {
-        return this.wrap(this.find(path));
-      } catch {
-        return;
-      }
-    }, '$') as any;
-  }
-
   /**
    * Given a JSON/CBOR value, constructs CRDT nodes recursively out of it and
    * sets the root node of the model to the constructed nodes.

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

@@ -58,9 +58,11 @@ export type JsonNodeToProxyPathNode<N> = 0 extends 1 & N
       ? {[K in keyof Obj]: JsonNodeToProxyPathNode<Obj[K]>} & JsonNodeToProxyPathNodeEnd<N>
       : N extends nodes.VecNode<infer Tuple>
         ? {[K in keyof Tuple]: JsonNodeToProxyPathNode<Tuple[K]>} & JsonNodeToProxyPathNodeEnd<N>
-        : nodes.JsonNode<unknown> extends N
-          ? ProxyPathNode<{$?: NodeApi<N extends nodes.JsonNode<unknown> ? N : nodes.JsonNode>}>
-          : JsonNodeToProxyPathNodeEnd<N>;
+        : N extends nodes.RootNode<infer M>
+          ? JsonNodeToProxyPathNode<M>
+          : nodes.JsonNode<unknown> extends N
+            ? ProxyPathNode<{$?: NodeApi<N extends nodes.JsonNode<unknown> ? N : nodes.JsonNode>}>
+            : JsonNodeToProxyPathNodeEnd<N>;
 
 export type ProxyPathEndMethod<Args extends unknown[], Return> = (path: PathStep[], ...args: Args) => Return;
 export type ProxyPathUserEndMethod<M extends ProxyPathEndMethod<any[], any>> = M extends ProxyPathEndMethod<