forge-sql-orm 2.1.0 → 2.1.2

package/src/utils/cacheContextUtils.ts

@@ -78,6 +78,7 @@ export async function saveTableIfInsideCacheContext<T extends AnyMySqlTable>(
  *
  * @param query - The Drizzle query to cache
  * @param rows - The query result data to cache
+ * @param options - ForgeSqlOrm options
  * @returns Promise that resolves when the data is saved to local cache
  *
  * @example
@@ -89,7 +90,7 @@ export async function saveTableIfInsideCacheContext<T extends AnyMySqlTable>(
  */
 export async function saveQueryLocalCacheQuery<
   T extends MySqlSelectDynamic<AnyMySqlSelectQueryBuilder>,
->(query: T, rows: unknown[]): Promise<void> {
+>(query: T, rows: unknown[], options: ForgeSqlOrmOptions): Promise<void> {
   const context = localCacheApplicationContext.getStore();
   if (context) {
     if (!context.cache) {
@@ -101,6 +102,12 @@ export async function saveQueryLocalCacheQuery<
       sql: sql.toSQL().sql.toLowerCase(),
       data: rows,
     };
+    if (options.logRawSqlQuery) {
+      const q = sql.toSQL();
+      console.log(
+        `[forge-sql-orm][local-cache][SAVE] Stored result in cache. sql="${q.sql}", params=${JSON.stringify(q.params)}`,
+      );
+    }
   }
 }
 
@@ -109,6 +116,7 @@ export async function saveQueryLocalCacheQuery<
  * This function checks if a query result is already cached in memory.
  *
  * @param query - The Drizzle query to check for cached results
+ * @param options - Option Property
  * @returns Promise that resolves to cached data if found, undefined otherwise
  *
  * @example
@@ -123,7 +131,7 @@ export async function saveQueryLocalCacheQuery<
  */
 export async function getQueryLocalCacheQuery<
   T extends MySqlSelectDynamic<AnyMySqlSelectQueryBuilder>,
->(query: T): Promise<unknown[] | undefined> {
+>(query: T, options: ForgeSqlOrmOptions): Promise<unknown[] | undefined> {
   const context = localCacheApplicationContext.getStore();
   if (context) {
     if (!context.cache) {
@@ -132,6 +140,12 @@ export async function getQueryLocalCacheQuery<
     const sql = query as { toSQL: () => Query };
     const key = hashKey(sql.toSQL());
     if (context.cache[key] && context.cache[key].sql === sql.toSQL().sql.toLowerCase()) {
+      if (options.logRawSqlQuery) {
+        const q = sql.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;
     }
   }

package/src/utils/sqlUtils.ts

@@ -75,19 +75,44 @@ export const parseDateTime = (value: string | Date, format: string): Date => {
 };
 
 /**
- * Helper function to validate and format Date objects using DateTime
- * @param value - Date object to validate and format
- * @param format - DateTime format string
- * @returns Formatted date string
- * @throws Error if date is invalid
+ * Helper function to validate and format a date-like value using Luxon DateTime.
+ * @param value - Date object, ISO/RFC2822/SQL/HTTP string, or timestamp (number|string).
+ * @param format - DateTime format string (Luxon format tokens).
+ * @returns Formatted date string.
+ * @throws Error if value cannot be parsed as a valid date.
  */
-export function formatDateTime(value: Date, format: string): string {
-  const fromJSDate = DateTime.fromJSDate(value);
-  if (fromJSDate.isValid) {
-    return fromJSDate.toFormat(format);
+export function formatDateTime(value: Date | string | number, format: string): string {
+  let dt: DateTime | null = null;
+
+  if (value instanceof Date) {
+    dt = DateTime.fromJSDate(value);
+  } else if (typeof value === "string") {
+    for (const parser of [
+      DateTime.fromISO,
+      DateTime.fromRFC2822,
+      DateTime.fromSQL,
+      DateTime.fromHTTP,
+    ]) {
+      dt = parser(value);
+      if (dt.isValid) break;
+    }
+    if (!dt?.isValid) {
+      const parsed = Number(value);
+      if (!isNaN(parsed)) {
+        dt = DateTime.fromMillis(parsed);
+      }
+    }
+  } else if (typeof value === "number") {
+    dt = DateTime.fromMillis(value);
   } else {
+    throw new Error("Unsupported type");
+  }
+
+  if (!dt?.isValid) {
     throw new Error("Invalid Date");
   }
+
+  return dt.toFormat(format);
 }
 
 /**