forge-sql-orm 2.1.6 → 2.1.8

package/dist/ForgeSQLORM.mjs

@@ -546,6 +546,9 @@ async function setCacheResult(query, options, results, cacheTtl) {
     console.error(`Error setting cache: ${error.message}`, error);
   }
 }
+function isQuery(obj) {
+  return typeof obj === "object" && obj !== null && typeof obj.sql === "string" && Array.isArray(obj.params);
+}
 const cacheApplicationContext = new AsyncLocalStorage();
 const localCacheApplicationContext = new AsyncLocalStorage();
 async function saveTableIfInsideCacheContext(table) {
@@ -561,7 +564,12 @@ async function saveQueryLocalCacheQuery(query, rows, options) {
     if (!context.cache) {
       context.cache = {};
     }
-    const sql2 = query;
+    let sql2;
+    if (isQuery(query)) {
+      sql2 = { toSQL: () => query };
+    } else {
+      sql2 = query;
+    }
     const key = hashKey(sql2.toSQL());
     context.cache[key] = {
       sql: sql2.toSQL().sql.toLowerCase(),
@@ -581,7 +589,12 @@ async function getQueryLocalCacheQuery(query, options) {
     if (!context.cache) {
       context.cache = {};
     }
-    const sql2 = query;
+    let sql2;
+    if (isQuery(query)) {
+      sql2 = { toSQL: () => query };
+    } else {
+      sql2 = query;
+    }
     const key = hashKey(sql2.toSQL());
     if (context.cache[key] && context.cache[key].sql === sql2.toSQL().sql.toLowerCase()) {
       if (options.logCache) {
@@ -1066,7 +1079,7 @@ async function processDDLResult(method, result) {
   if (result.metadata) {
     await saveMetaDataToContext(result.metadata);
   }
-  if (!result.rows) {
+  if (!result?.rows) {
     return { rows: [] };
   }
   if (isUpdateQueryResponse(result.rows)) {
@@ -1090,8 +1103,8 @@ async function processExecuteMethod(query, params) {
   }
   const result = await withTimeout$1(sqlStatement.execute());
   await saveMetaDataToContext(result.metadata);
-  if (!result.rows) {
-    return { rows: [] };
+  if (!result?.rows || Array.isArray(result.rows) && result.rows.length === 0) {
+    return { rows: [void 0] };
   }
   if (isUpdateQueryResponse(result.rows)) {
     const oneRow = result.rows;
@@ -1106,7 +1119,7 @@ async function processAllMethod(query, params) {
   }
   const result = await withTimeout$1(sqlStatement.execute());
   await saveMetaDataToContext(result.metadata);
-  if (!result.rows) {
+  if (!result?.rows) {
     return { rows: [] };
   }
   const rows = result.rows.map((r) => Object.values(r));
@@ -1195,7 +1208,7 @@ async function handleSuccessfulExecution(rows, onfulfilled, table, options, isCa
     if (isCached && !cacheApplicationContext.getStore()) {
       await clearCache(table, options);
     }
-    const result = onfulfilled?.(rows);
+    const result = onfulfilled ? onfulfilled(rows) : rows;
     return result;
   } catch (error) {
     if (shouldClearCacheOnError(error)) {
@@ -1266,11 +1279,11 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
   try {
     const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
-      return onfulfilled?.(localCached);
+      return onfulfilled ? onfulfilled(localCached) : localCached;
     }
     const cacheResult = await getFromCache(target, options);
     if (cacheResult) {
-      return onfulfilled?.(cacheResult);
+      return onfulfilled ? onfulfilled(cacheResult) : cacheResult;
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
@@ -1278,23 +1291,29 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
     await setCacheResult(target, options, transformed, cacheTtl).catch((cacheError) => {
       console.warn("Cache set error:", cacheError);
     });
-    return onfulfilled?.(transformed);
+    return onfulfilled ? onfulfilled(transformed) : transformed;
   } catch (error) {
-    return onrejected?.(error);
+    if (onrejected) {
+      return onrejected(error);
+    }
+    throw error;
   }
 }
 async function handleNonCachedQuery(target, options, selections, aliasMap, onfulfilled, onrejected) {
   try {
     const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
-      return onfulfilled?.(localCached);
+      return onfulfilled ? onfulfilled(localCached) : localCached;
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
     await saveQueryLocalCacheQuery(target, transformed, options);
-    return onfulfilled?.(transformed);
+    return onfulfilled ? onfulfilled(transformed) : transformed;
   } catch (error) {
-    return onrejected?.(error);
+    if (onrejected) {
+      return onrejected(error);
+    }
+    throw error;
   }
 }
 function createAliasedSelectBuilder(db, fields, selectFn, useCache, options, cacheTtl) {