@vibeorm/runtime 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeorm/runtime",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Driver-agnostic query engine and client runtime for VibeORM",
   "license": "MIT",
   "keywords": [

package/src/client.ts

@@ -1032,70 +1032,86 @@ export function createClient(params: {
   ): Promise<T | unknown[]> {
     // Array-of-promises style
     if (Array.isArray(fnOrPromises)) {
-      return adapter.transaction(async () => {
-        return Promise.all(fnOrPromises);
-      }, txOptions);
+      try {
+        return await adapter.transaction(async () => {
+          return Promise.all(fnOrPromises);
+        }, txOptions);
+      } catch (err) {
+        throw normalizeError({ error: err });
+      }
     }
 
     // Callback style
     const fn = fnOrPromises as (tx: Record<string, unknown>) => Promise<T>;
-    return adapter.transaction(async (txAdapter) => {
-      // Create a transactional executor — normalizes DB errors
-      async function txExecutor(txParams: { text: string; values: unknown[] }): Promise<Record<string, unknown>[]> {
-        const values = txParams.values.map((v) => (v instanceof PgArray ? txAdapter.formatArrayParam(v.values) : v));
-        if (shouldLog) {
-          console.log(`[vibeorm:tx] ${txParams.text}`);
-          if (values.length > 0) {
-            console.log(`[vibeorm:tx] params:`, values);
+    try {
+      return await adapter.transaction(async (txAdapter) => {
+        // Create a transactional executor — normalizes DB errors
+        async function txExecutor(txParams: { text: string; values: unknown[] }): Promise<Record<string, unknown>[]> {
+          const values = txParams.values.map((v) => (v instanceof PgArray ? txAdapter.formatArrayParam(v.values) : v));
+          if (shouldLog) {
+            console.log(`[vibeorm:tx] ${txParams.text}`);
+            if (values.length > 0) {
+              console.log(`[vibeorm:tx] params:`, values);
+            }
+          }
+          try {
+            return await txAdapter.execute({ text: txParams.text, values });
+          } catch (err) {
+            throw normalizeError({ error: err });
           }
         }
-        try {
-          return await txAdapter.execute({ text: txParams.text, values });
-        } catch (err) {
-          throw normalizeError({ error: err });
-        }
-      }
-
-      // Build transactional delegates
-      const txClient: Record<string, unknown> = {};
-      for (const [key, meta] of Object.entries(allModelsMeta)) {
-        txClient[key] = createDelegate({
-          modelKey: key,
-          modelMeta: meta,
-          executor: txExecutor,
-          schemas: params.schemas?.[key],
-        });
-      }
 
-      // Add $queryRaw and $executeRaw to transactional client
-      txClient.$queryRaw = async function <T = unknown>(
-        strings: TemplateStringsArray,
-        ...values: unknown[]
-      ): Promise<T[]> {
-        const { text, params: sqlParams } = buildTaggedTemplateSql({ strings, values });
-        if (shouldLog) {
-          console.log(`[vibeorm:tx] ${text}`);
-          if (sqlParams.length > 0) console.log(`[vibeorm:tx] params:`, sqlParams);
+        // Build transactional delegates
+        const txClient: Record<string, unknown> = {};
+        for (const [key, meta] of Object.entries(allModelsMeta)) {
+          txClient[key] = createDelegate({
+            modelKey: key,
+            modelMeta: meta,
+            executor: txExecutor,
+            schemas: params.schemas?.[key],
+          });
         }
-        const result = await txAdapter.executeUnsafe({ text, values: sqlParams });
-        return result.rows as T[];
-      };
 
-      txClient.$executeRaw = async function (
-        strings: TemplateStringsArray,
-        ...values: unknown[]
-      ): Promise<number> {
-        const { text, params: sqlParams } = buildTaggedTemplateSql({ strings, values });
-        if (shouldLog) {
-          console.log(`[vibeorm:tx] ${text}`);
-          if (sqlParams.length > 0) console.log(`[vibeorm:tx] params:`, sqlParams);
-        }
-        const result = await txAdapter.executeUnsafe({ text, values: sqlParams });
-        return result.affectedRows;
-      };
+        // Add $queryRaw and $executeRaw to transactional client
+        txClient.$queryRaw = async function <T = unknown>(
+          strings: TemplateStringsArray,
+          ...values: unknown[]
+        ): Promise<T[]> {
+          const { text, params: sqlParams } = buildTaggedTemplateSql({ strings, values });
+          if (shouldLog) {
+            console.log(`[vibeorm:tx] ${text}`);
+            if (sqlParams.length > 0) console.log(`[vibeorm:tx] params:`, sqlParams);
+          }
+          try {
+            const result = await txAdapter.executeUnsafe({ text, values: sqlParams });
+            return result.rows as T[];
+          } catch (err) {
+            throw normalizeError({ error: err });
+          }
+        };
 
-      return fn(txClient);
-    }, txOptions);
+        txClient.$executeRaw = async function (
+          strings: TemplateStringsArray,
+          ...values: unknown[]
+        ): Promise<number> {
+          const { text, params: sqlParams } = buildTaggedTemplateSql({ strings, values });
+          if (shouldLog) {
+            console.log(`[vibeorm:tx] ${text}`);
+            if (sqlParams.length > 0) console.log(`[vibeorm:tx] params:`, sqlParams);
+          }
+          try {
+            const result = await txAdapter.executeUnsafe({ text, values: sqlParams });
+            return result.affectedRows;
+          } catch (err) {
+            throw normalizeError({ error: err });
+          }
+        };
+
+        return fn(txClient);
+      }, txOptions);
+    } catch (err) {
+      throw normalizeError({ error: err });
+    }
   };
 
   // $queryRaw — tagged template literal for safe parameterized queries
@@ -1110,8 +1126,12 @@ export function createClient(params: {
         console.log(`[vibeorm:raw] params:`, sqlParams);
       }
     }
-    const result = await adapter.executeUnsafe({ text, values: sqlParams });
-    return result.rows as T[];
+    try {
+      const result = await adapter.executeUnsafe({ text, values: sqlParams });
+      return result.rows as T[];
+    } catch (err) {
+      throw normalizeError({ error: err });
+    }
   };
 
   // $executeRaw — tagged template literal for INSERT/UPDATE/DELETE returning affected count
@@ -1126,8 +1146,12 @@ export function createClient(params: {
         console.log(`[vibeorm:raw] params:`, sqlParams);
       }
     }
-    const result = await adapter.executeUnsafe({ text, values: sqlParams });
-    return result.affectedRows;
+    try {
+      const result = await adapter.executeUnsafe({ text, values: sqlParams });
+      return result.affectedRows;
+    } catch (err) {
+      throw normalizeError({ error: err });
+    }
   };
 
   // $queryRawUnsafe — accepts a plain SQL string + params array
@@ -1141,12 +1165,16 @@ export function createClient(params: {
         console.log(`[vibeorm:raw] params:`, values);
       }
     }
-    if (values.length === 0) {
-      const result = await adapter.executeUnsafe({ text: query });
-      return result.rows as T[];
+    try {
+      if (values.length === 0) {
+        const result = await adapter.executeUnsafe({ text: query });
+        return result.rows as T[];
+      }
+      const rows = await adapter.execute({ text: query, values });
+      return rows as T[];
+    } catch (err) {
+      throw normalizeError({ error: err });
     }
-    const rows = await adapter.execute({ text: query, values });
-    return rows as T[];
   };
 
   // $executeRawUnsafe — accepts a plain SQL string + params array, returns affected count
@@ -1160,8 +1188,12 @@ export function createClient(params: {
         console.log(`[vibeorm:raw] params:`, values);
       }
     }
-    const result = await adapter.executeUnsafe({ text: query, values: values.length > 0 ? values : undefined });
-    return result.affectedRows;
+    try {
+      const result = await adapter.executeUnsafe({ text: query, values: values.length > 0 ? values : undefined });
+      return result.affectedRows;
+    } catch (err) {
+      throw normalizeError({ error: err });
+    }
   };
 
   // $connect