Properly type fetchById and ensure returns null if not found

aspen-cloud · May 2, 2024 · 02284c0 · 02284c0
1 parent a59738a
commit 02284c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/nine-books-joke.md b/.changeset/nine-books-joke.md
@@ -0,0 +1,5 @@
+---
+'@triplit/client': patch
+---
+
+Properly type fetchById and ensure returns null if not found
diff --git a/packages/client/src/triplit-client.ts b/packages/client/src/triplit-client.ts
@@ -351,7 +351,7 @@ export class TriplitClient<M extends ClientSchema | undefined = undefined> {
     id: string,
     queryParams?: FetchByIdQueryParams<M, CN>,
     options?: Partial<FetchOptions>
-  ) {
+  ): Promise<ClientFetchResultEntity<ClientQuery<M, CN>> | null> {
     this.logger.debug(
       'fetchById START',
       collectionName,
@@ -371,7 +371,9 @@ export class TriplitClient<M extends ClientSchema | undefined = undefined> {
       queryParams,
       options
     );
-    return results.get(id);
+    const entity = results.get(id);
+    if (!entity) return null;
+    return entity;
   }
 
   async fetchOne<CQ extends ClientQuery<M, any>>(