reactor(qb): throw error instead of returning it

OrbisWeb3 · Feb 7, 2024 · 70b0ddb · 70b0ddb
1 parent 707d779
commit 70b0ddb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/src/querybuilder/statements/insert.ts b/src/querybuilder/statements/insert.ts
@@ -2,6 +2,7 @@ import { validate as validateJsonSchema } from "jsonschema";
 import { StatementHistory } from "./historyProvider.js";
 import { OrbisDB, OrbisDocument } from "../../index.js";
 import { catchError } from "../../util/tryit.js";
+import { OrbisError } from "../../util/results.js";
 
 export class BulkInsertStatement<
   T = Record<string, any>,
@@ -302,29 +303,28 @@ export class InsertStatement<T = Record<string, any>> extends StatementHistory {
       model,
     };
 
-    try {
-      const document = await this.#orbis.ceramic.createDocument(query);
-
-      super.storeResult({
-        timestamp,
-        success: true,
-        result: document,
-        query,
-      });
+    const [document, error] = await catchError(() =>
+      this.#orbis.ceramic.createDocument(query)
+    );
 
-      return document;
-    } catch (error) {
+    if (error) {
       super.storeResult({
         timestamp,
         success: false,
         error,
         query,
       });
 
-      return {
-        query,
-        error,
-      };
+      throw new OrbisError(error.message, { error, query });
     }
+
+    super.storeResult({
+      timestamp,
+      success: true,
+      result: document,
+      query,
+    });
+
+    return document;
   }
 }
diff --git a/src/querybuilder/statements/select.ts b/src/querybuilder/statements/select.ts
@@ -5,6 +5,7 @@ import { StatementHistory } from "./historyProvider.js";
 import { OrderByParams, SqlSelectBuilder } from "./sqlbuild/index.js";
 
 import { catchError } from "../../util/tryit.js";
+import { OrbisError } from "../../util/results.js";
 
 // TODO: Improve typing for operators (and enable nested queries)
 export class SelectStatement<T = Record<string, any>> extends StatementHistory {
@@ -211,7 +212,7 @@ export class SelectStatement<T = Record<string, any>> extends StatementHistory {
         timestamp,
       });
 
-      return { query, error };
+      throw new OrbisError(error.message, { error, query });
     }
 
     super.storeResult({

diff --git a/src/querybuilder/statements/update.ts b/src/querybuilder/statements/update.ts
@@ -2,6 +2,7 @@ import { StreamID } from "@ceramicnetwork/streamid";
 import { OrbisDB } from "../../index.js";
 import { StatementHistory } from "./historyProvider.js";
 import { catchError } from "../../util/tryit.js";
+import { OrbisError } from "../../util/results.js";
 
 export class UpdateByIdStatement<
   T = Record<string, any>,
@@ -107,12 +108,16 @@ export class UpdateByIdStatement<
         query,
       });
 
-      return {
-        query,
-        error,
-      };
+      throw new OrbisError(error.message, { error, query });
     }
 
+    super.storeResult({
+      timestamp,
+      success: true,
+      result: document,
+      query,
+    });
+
     return document;
   }
 }