@graffy/core 0.16.20-alpha.2 → 0.16.20-alpha.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/core",
   "description": "The main module for Graffy, a library for intuitive real-time data APIs.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.16.20-alpha.2",
+  "version": "0.16.20-alpha.4",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.20-alpha.2",
-    "@graffy/stream": "0.16.20-alpha.2",
+    "@graffy/common": "0.16.20-alpha.4",
+    "@graffy/stream": "0.16.20-alpha.4",
     "debug": "^4.3.7"
   }
 }

package/types/index.d.ts

@@ -1,9 +1,15 @@
-export type JsonObject = Record<string, unknown>;
+export type AnyLeaf = string | number | boolean | null;
 
-type Key = unknown;
+// biome-ignore lint/suspicious/noExplicitAny: This is used to match concrete types in "extends" expressions.
+export type AnyObject = Record<string, any>;
 
-// biome-ignore lint/suspicious/noExplicitAny: "Unknown" prevents assigning a concrete type to this parameter.
-export type GraffyCollection<CollectionSchema extends Record<string, any>> = {
+// biome-ignore lint/suspicious/noExplicitAny: Function for which types are not yet defined.
+type AnyFunction = (...args: any[]) => any;
+
+// biome-ignore lint/suspicious/noExplicitAny: Keys can be anything.
+type Key = any;
+
+export type GraffyCollection<CollectionSchema extends AnyObject> = {
   [name: string]: CollectionSchema;
 } & { __brand: 'GraffyCollection' };
 
@@ -21,55 +27,57 @@ export default class Graffy<S> {
     options?: GraffyReadOptions,
   ): Promise<ReadResult<S, Q>>;
 
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  on: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  call: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  use: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  onRead: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  onWrite: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  onWatch: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  write: (...any) => any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: add typings
-  watch: (...any) => any;
+  on: AnyFunction;
+  call: AnyFunction;
+  use: AnyFunction;
+  onRead: AnyFunction;
+  onWrite: AnyFunction;
+  onWatch: AnyFunction;
+  write: AnyFunction;
+  watch: AnyFunction;
 }
 
-export type PathOf<S> = S extends GraffyCollection<BuildObject>
-  ? string | Key
-  : S extends JsonObject
+// TODO: To avoid the "too deep" error, these need to be tail-recursive.
+// This may be possible with an "accummulator" type parameter.
+// https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-5.html#tail-recursion-elimination-on-conditional-types
+
+export type PathOf<S> = S extends GraffyCollection<AnyObject>
+  ? Key
+  : S extends AnyObject
     ? keyof S | [keyof S, ...PathOf<S[keyof S]>[]]
     : never;
 
-export type Descend<S, P> = S extends GraffyCollection<BuildObject>
+type Get<S, K> = S extends GraffyCollection<AnyObject>
   ? S[string]
-  : P extends keyof S
-    ? S[P]
-    : P extends [keyof S]
-      ? S[P[0]]
-      : P extends [keyof S, ...infer R]
-        ? Descend<S[P[0]], R>
-        : S;
+  : K extends keyof S
+    ? S[K]
+    : never;
+
+export type Descend<S, P> = P extends [Key]
+  ? Get<S, P[0]>
+  : P extends [Key, ...infer R]
+    ? Descend<Get<S, P[0]>, R>
+    : Get<S, P>;
 
-export type Project<S> = S extends GraffyCollection<BuildObject>
-  ?
-      | (Project<S[string]> & { $key: Key })
-      | (Project<S[string]> & { $key: Key })[]
-  : S extends JsonObject
-    ? Partial<{ [K in keyof S]: Project<S[K]> }>
-    : boolean;
+export type Project<S> = S extends AnyLeaf
+  ? boolean
+  : S extends GraffyCollection<AnyObject>
+    ?
+        | (Project<S[string]> & { $key: Key })
+        | (Project<S[string]> & { $key: Key })[]
+    : S extends AnyObject
+      ? Partial<{ [K in keyof S]: Project<S[K]> }> | boolean
+      : never;
 
 // biome-ignore lint/suspicious/noExplicitAny: <explanation>
 type ResultArray<R> = R[] & { $page: any; $next: any; $prev: any };
 
-type ReadResult<S, Q> = S extends GraffyCollection<BuildObject>
-  ? (S[string] & { $key: Key }) | ResultArray<S[string] & { $key: Key }>
-  : S extends JsonObject
+type ReadResult<S, Q> = S extends GraffyCollection<AnyObject>
+  ? Q extends Array<AnyObject> | { $key: Key }
+    ? ResultArray<S[string] & { $key: Key }>
+    : S[string] & { $key: Key }
+  : S extends AnyObject
     ? { [K in keyof S & keyof Q]: ReadResult<S[K], Q[K]> }
     : S;
 
-type GraffyReadOptions = JsonObject;
+type GraffyReadOptions = AnyObject;