forge-sql-orm 2.1.1 → 2.1.2

package/dist/ForgeSQLORM.mjs

@@ -534,7 +534,7 @@ async function saveTableIfInsideCacheContext(table) {
     context.tables.add(tableName);
   }
 }
-async function saveQueryLocalCacheQuery(query, rows) {
+async function saveQueryLocalCacheQuery(query, rows, options) {
   const context = localCacheApplicationContext.getStore();
   if (context) {
     if (!context.cache) {
@@ -546,9 +546,15 @@ async function saveQueryLocalCacheQuery(query, rows) {
       sql: sql2.toSQL().sql.toLowerCase(),
       data: rows
     };
+    if (options.logRawSqlQuery) {
+      const q = sql2.toSQL();
+      console.log(
+        `[forge-sql-orm][local-cache][SAVE] Stored result in cache. sql="${q.sql}", params=${JSON.stringify(q.params)}`
+      );
+    }
   }
 }
-async function getQueryLocalCacheQuery(query) {
+async function getQueryLocalCacheQuery(query, options) {
   const context = localCacheApplicationContext.getStore();
   if (context) {
     if (!context.cache) {
@@ -557,6 +563,12 @@ async function getQueryLocalCacheQuery(query) {
     const sql2 = query;
     const key = hashKey(sql2.toSQL());
     if (context.cache[key] && context.cache[key].sql === sql2.toSQL().sql.toLowerCase()) {
+      if (options.logRawSqlQuery) {
+        const q = sql2.toSQL();
+        console.log(
+          `[forge-sql-orm][local-cache][HIT] Returned cached result. sql="${q.sql}", params=${JSON.stringify(q.params)}`
+        );
+      }
       return context.cache[key].data;
     }
   }
@@ -1046,23 +1058,10 @@ function createForgeDriverProxy(options, logRawSqlQuery) {
     return forgeDriver(modifiedQuery, params, method);
   };
 }
-const NON_CACHE_CLEARING_ERROR_CODES = [
-  "VALIDATION_ERROR",
-  "CONSTRAINT_ERROR"
-];
-const CACHE_CLEARING_ERROR_CODES = [
-  "DEADLOCK",
-  "LOCK_WAIT_TIMEOUT",
-  "CONNECTION_ERROR"
-];
-const NON_CACHE_CLEARING_PATTERNS = [
-  /validation/i,
-  /constraint/i
-];
-const CACHE_CLEARING_PATTERNS = [
-  /timeout/i,
-  /connection/i
-];
+const NON_CACHE_CLEARING_ERROR_CODES = ["VALIDATION_ERROR", "CONSTRAINT_ERROR"];
+const CACHE_CLEARING_ERROR_CODES = ["DEADLOCK", "LOCK_WAIT_TIMEOUT", "CONNECTION_ERROR"];
+const NON_CACHE_CLEARING_PATTERNS = [/validation/i, /constraint/i];
+const CACHE_CLEARING_PATTERNS = [/timeout/i, /connection/i];
 function shouldClearCacheOnError(error) {
   if (error?.code && NON_CACHE_CLEARING_ERROR_CODES.includes(error.code)) {
     return false;
@@ -1154,7 +1153,7 @@ function deleteAndEvictCacheBuilder(db, table, options, isCached) {
 }
 async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap, onfulfilled, onrejected) {
   try {
-    const localCached = await getQueryLocalCacheQuery(target);
+    const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
       return onfulfilled?.(localCached);
     }
@@ -1164,7 +1163,7 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
-    await saveQueryLocalCacheQuery(target, transformed);
+    await saveQueryLocalCacheQuery(target, transformed, options);
     await setCacheResult(target, options, transformed, cacheTtl).catch((cacheError) => {
       console.warn("Cache set error:", cacheError);
     });
@@ -1173,15 +1172,15 @@ async function handleCachedQuery(target, options, cacheTtl, selections, aliasMap
     return onrejected?.(error);
   }
 }
-async function handleNonCachedQuery(target, selections, aliasMap, onfulfilled, onrejected) {
+async function handleNonCachedQuery(target, options, selections, aliasMap, onfulfilled, onrejected) {
   try {
-    const localCached = await getQueryLocalCacheQuery(target);
+    const localCached = await getQueryLocalCacheQuery(target, options);
     if (localCached) {
       return onfulfilled?.(localCached);
     }
     const rows = await target.execute();
     const transformed = applyFromDriverTransform(rows, selections, aliasMap);
-    await saveQueryLocalCacheQuery(target, transformed);
+    await saveQueryLocalCacheQuery(target, transformed, options);
     return onfulfilled?.(transformed);
   } catch (error) {
     return onrejected?.(error);
@@ -1213,7 +1212,14 @@ function createAliasedSelectBuilder(db, fields, selectFn, useCache, options, cac
                 onrejected
               );
             } else {
-              return handleNonCachedQuery(target, selections, aliasMap, onfulfilled, onrejected);
+              return handleNonCachedQuery(
+                target,
+                options,
+                selections,
+                aliasMap,
+                onfulfilled,
+                onrejected
+              );
             }
           };
         }
@@ -1247,14 +1253,16 @@ function createRawQueryExecutor(db, options, useGlobalCache = false) {
     let sql2;
     if (isSQLWrapper(query)) {
       const sqlWrapper = query;
-      sql2 = sqlWrapper.getSQL().toQuery(db.dialect);
+      sql2 = sqlWrapper.getSQL().toQuery(
+        db.dialect
+      );
     } else {
       sql2 = {
         sql: query,
         params: []
       };
     }
-    const localCacheResult = await getQueryLocalCacheQuery(sql2);
+    const localCacheResult = await getQueryLocalCacheQuery(sql2, options);
     if (localCacheResult) {
       return localCacheResult;
     }
@@ -1265,7 +1273,7 @@ function createRawQueryExecutor(db, options, useGlobalCache = false) {
       }
     }
     const results = await db.execute(query);
-    await saveQueryLocalCacheQuery(sql2, results);
+    await saveQueryLocalCacheQuery(sql2, results, options);
     if (useGlobalCache) {
       await setCacheResult(
         { toSQL: () => sql2 },
@@ -1816,34 +1824,40 @@ class ForgeSQLORMImpl {
    */
   async executeWithCacheContextAndReturnValue(cacheContext) {
     return await this.executeWithLocalCacheContextAndReturnValue(
-      async () => await cacheApplicationContext.run(cacheApplicationContext.getStore() ?? { tables: /* @__PURE__ */ new Set() }, async () => {
-        try {
-          return await cacheContext();
-        } finally {
-          await clearTablesCache(
-            Array.from(cacheApplicationContext.getStore()?.tables ?? []),
-            this.options
-          );
+      async () => await cacheApplicationContext.run(
+        cacheApplicationContext.getStore() ?? { tables: /* @__PURE__ */ new Set() },
+        async () => {
+          try {
+            return await cacheContext();
+          } finally {
+            await clearTablesCache(
+              Array.from(cacheApplicationContext.getStore()?.tables ?? []),
+              this.options
+            );
+          }
         }
-      })
+      )
     );
   }
   /**
    * Executes operations within a local cache context and returns a value.
    * This provides in-memory caching for select queries within a single request scope.
-   * 
+   *
    * @param cacheContext - Function containing operations that will benefit from local caching
    * @returns Promise that resolves to the return value of the cacheContext function
    */
   async executeWithLocalCacheContextAndReturnValue(cacheContext) {
-    return await localCacheApplicationContext.run(localCacheApplicationContext.getStore() ?? { cache: {} }, async () => {
-      return await cacheContext();
-    });
+    return await localCacheApplicationContext.run(
+      localCacheApplicationContext.getStore() ?? { cache: {} },
+      async () => {
+        return await cacheContext();
+      }
+    );
   }
   /**
    * Executes operations within a local cache context.
    * This provides in-memory caching for select queries within a single request scope.
-   * 
+   *
    * @param cacheContext - Function containing operations that will benefit from local caching
    * @returns Promise that resolves when all operations are complete
    */
@@ -2140,7 +2154,7 @@ class ForgeSQLORMImpl {
    * ```typescript
    * // Using SQLWrapper
    * const result = await forgeSQL.execute(sql`SELECT * FROM users WHERE id = ${userId}`);
-   * 
+   *
    * // Using string
    * const result = await forgeSQL.execute("SELECT * FROM users WHERE status = 'active'");
    * ```
@@ -2161,7 +2175,7 @@ class ForgeSQLORMImpl {
    * ```typescript
    * // Using SQLWrapper with custom TTL
    * const result = await forgeSQL.executeCacheable(sql`SELECT * FROM users WHERE id = ${userId}`, 300);
-   * 
+   *
    * // Using string with default TTL
    * const result = await forgeSQL.executeCacheable("SELECT * FROM users WHERE status = 'active'");
    * ```
@@ -2199,7 +2213,7 @@ class ForgeSQLORMImpl {
    *     .from(users)
    *     .groupBy(users.id)
    * );
-   * 
+   *
    * const result = await forgeSQL.with(withQuery)
    *   .select({ userId: withQuery.userId, count: withQuery.count })
    *   .from(withQuery);
@@ -2291,7 +2305,7 @@ class ForgeSQLORM {
   /**
    * Executes operations within a local cache context.
    * This provides in-memory caching for select queries within a single request scope.
-   * 
+   *
    * @param cacheContext - Function containing operations that will benefit from local caching
    * @returns Promise that resolves when all operations are complete
    */
@@ -2301,7 +2315,7 @@ class ForgeSQLORM {
   /**
    * Executes operations within a local cache context and returns a value.
    * This provides in-memory caching for select queries within a single request scope.
-   * 
+   *
    * @param cacheContext - Function containing operations that will benefit from local caching
    * @returns Promise that resolves to the return value of the cacheContext function
    */
@@ -2465,7 +2479,7 @@ class ForgeSQLORM {
    * ```typescript
    * // Using SQLWrapper
    * const result = await forgeSQL.execute(sql`SELECT * FROM users WHERE id = ${userId}`);
-   * 
+   *
    * // Using string
    * const result = await forgeSQL.execute("SELECT * FROM users WHERE status = 'active'");
    * ```
@@ -2486,7 +2500,7 @@ class ForgeSQLORM {
    * ```typescript
    * // Using SQLWrapper with custom TTL
    * const result = await forgeSQL.executeCacheable(sql`SELECT * FROM users WHERE id = ${userId}`, 300);
-   * 
+   *
    * // Using string with default TTL
    * const result = await forgeSQL.executeCacheable("SELECT * FROM users WHERE status = 'active'");
    * ```
@@ -2524,7 +2538,7 @@ class ForgeSQLORM {
    *     .from(users)
    *     .groupBy(users.id)
    * );
-   * 
+   *
    * const result = await forgeSQL.with(withQuery)
    *   .select({ userId: withQuery.userId, count: withQuery.count })
    *   .from(withQuery);