feat: 🎸 improve ObjValue as a router API

Author: streamich

package.json

@@ -64,7 +64,7 @@
     "@jsonjoy.com/util": "^1.9.0",
     "sonic-forest": "^1.2.1",
     "thingies": "^2.5.0",
-    "tree-dump": "^1.0.3"
+    "tree-dump": "^1.1.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.3",

src/value/ObjValue.ts

@@ -1,9 +1,9 @@
-import {printTree} from 'tree-dump/lib/printTree';
+import {ModuleType} from '../type/classes/ModuleType';
+import {Value} from './Value';
+import {FnValue} from './FnValue';
 import type {Printable} from 'tree-dump/lib/types';
 import type * as classes from '../type';
 import type {TypeBuilder} from '../type/TypeBuilder';
-import {ModuleType} from '../type/classes/ModuleType';
-import {Value} from './Value';
 
 export type UnObjType<T> = T extends classes.ObjType<infer U> ? U : never;
 export type UnObjValue<T> = T extends ObjValue<infer U> ? U : never;
@@ -14,6 +14,8 @@ export type ObjValueToTypeMap<F> = ToObject<{
   [K in keyof F]: ObjFieldToTuple<F[K]>;
 }>;
 
+export type Ensure<T, X> = T extends X ? T : X;
+
 export class ObjValue<T extends classes.ObjType<any>> extends Value<T> implements Printable {
   public static new = (system: ModuleType = new ModuleType()) => new ObjValue({}, system.t.obj);
 
@@ -41,6 +43,15 @@ export class ObjValue<T extends classes.ObjType<any>> extends Value<T> implement
     return new Value(data, field.val) as any;
   }
 
+  public fn<K extends keyof ObjValueToTypeMap<UnObjType<T>>>(
+    key: K,
+  ): FnValue<
+    Ensure<ObjValueToTypeMap<UnObjType<T>>[K] extends classes.Type ? ObjValueToTypeMap<UnObjType<T>>[K] : classes.Type, classes.FnType<any, any, any>>
+  > {
+    const val = this.get(key);
+    return new FnValue(val.data, val.type as any);
+  }
+
   public field<F extends classes.KeyType<any, any>>(
     field: F | ((t: TypeBuilder) => F),
     data: classes.ResolveType<UnObjFieldTypeVal<F>>,
@@ -78,7 +89,7 @@ export class ObjValue<T extends classes.ObjType<any>> extends Value<T> implement
     return this as any;
   }
 
-  public toString(tab: string = ''): string {
-    return 'ObjValue' + printTree(tab, [(tab) => this.type!.toString(tab)]);
+  public name(): string {
+    return 'ObjValue';
   }
 }

src/value/Value.ts

@@ -1,4 +1,5 @@
 import {printTree} from 'tree-dump/lib/printTree';
+import {printJson} from 'tree-dump/lib/printJson';
 import type {Printable} from 'tree-dump';
 import type {ResolveType, Type} from '../type/types';
 
@@ -27,7 +28,7 @@ export class Value<T extends Type = Type> implements Printable {
     const type = this.type;
     return this.name() + (type ? printTree(tab, [
       (tab) => type.toString(tab),
-      (tab) => (JSON.stringify(copyForPrint(this.data), null, 2) || 'und').replace(/"__fN---"/g, 'fn()').split('\n').join('\n' + tab),
+      (tab) => printJson(tab, copyForPrint(this.data)).replace(/"__fN---"/g, 'fn()'),
     ]) : '');
   }
 }

src/value/__tests__/ObjValue-router.spec.ts

@@ -0,0 +1,12 @@
+import {createRouter} from './ObjValue.fixtures';
+
+test('can retrieve field as Value', async () => {
+  const log = jest.fn();
+  const router = createRouter({log});
+  console.log(router + '');
+  console.log(router.fn('log.message') + '');
+  console.log(router.fn('log.message').data);
+  console.log(router.fn('log.message').type + '');
+  const result = await router.fn('log.message').exec({message: 'asdf'});
+  expect(result.data).toEqual({time: expect.any(Number)});
+});

src/value/__tests__/ObjValue.fixtures.ts

@@ -0,0 +1,39 @@
+import {ObjType} from "../../type";
+import {TypeBuilder} from "../../type/TypeBuilder";
+import {ObjValue} from "../ObjValue";
+
+interface Services {
+  log: (msg: string) => void;
+}
+
+export interface RouteDeps {
+  svc: Services;
+  t: TypeBuilder;
+}
+export type RouterBase = ObjType<any>;
+export type Router<R extends RouterBase> = ObjValue<R>;
+
+const addLogMessageRoute = ({t, svc}: RouteDeps) =>
+  <R extends RouterBase>(r: Router<R>) => {
+  return r.set('log.message', t.fn
+    .inp(t.Object(
+      t.Key('message', t.str),
+    ))
+    .out(t.object({
+      time: t.num,
+    }))
+    .value(({message}) => {
+      svc.log(message);
+      return {time: Date.now()};
+    })
+  )
+};
+
+export const createRouter = (svc: Services) => {
+  const base = ObjValue.new();
+  const t = base.system.t;
+  const deps: RouteDeps = {svc, t};
+  const router = addLogMessageRoute(deps)(base);
+  return router;
+};
+

yarn.lock

@@ -889,7 +889,7 @@ __metadata:
     rxjs: "npm:^7.8.2"
     sonic-forest: "npm:^1.2.1"
     thingies: "npm:^2.5.0"
-    tree-dump: "npm:^1.0.3"
+    tree-dump: "npm:^1.1.0"
     ts-jest: "npm:^29.1.2"
     tslib: "npm:^2.7.0"
     typescript: "npm:^5.6.2"
@@ -3530,7 +3530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tree-dump@npm:^1.0.0, tree-dump@npm:^1.0.3":
+"tree-dump@npm:^1.0.0":
   version: 1.0.3
   resolution: "tree-dump@npm:1.0.3"
   peerDependencies:
@@ -3539,6 +3539,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tree-dump@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "tree-dump@npm:1.1.0"
+  peerDependencies:
+    tslib: 2
+  checksum: 10c0/079f0f0163b68ee2eedc65cab1de6fb121487eba9ae135c106a8bc5e4ab7906ae0b57d86016e4a7da8c0ee906da1eae8c6a1490cd6e2a5e5ccbca321e1f959ca
+  languageName: node
+  linkType: hard
+
 "ts-jest@npm:^29.1.2":
   version: 29.4.1
   resolution: "ts-jest@npm:29.4.1"