forge-sql-orm 2.1.1 → 2.1.3

package/dist/ForgeSQLORM.js

@@ -36,11 +36,16 @@ const parseDateTime = (value, format) => {
     if (dt.isValid) {
       result = dt.toJSDate();
     } else {
-      const isoDt = luxon.DateTime.fromISO(value);
-      if (isoDt.isValid) {
-        result = isoDt.toJSDate();
+      const sqlDt = luxon.DateTime.fromSQL(value);
+      if (sqlDt.isValid) {
+        result = sqlDt.toJSDate();
       } else {
-        result = new Date(value);
+        const isoDt = luxon.DateTime.fromRFC2822(value);
+        if (isoDt.isValid) {
+          result = isoDt.toJSDate();
+        } else {
+          result = new Date(value);
+        }
       }
     }
   }
@@ -49,7 +54,7 @@ const parseDateTime = (value, format) => {
   }
   return result;
 };
-function formatDateTime(value, format) {
+function formatDateTime(value, format, isTimeStamp) {
   let dt = null;
   if (value instanceof Date) {
     dt = luxon.DateTime.fromJSDate(value);
@@ -77,6 +82,20 @@ function formatDateTime(value, format) {
   if (!dt?.isValid) {
     throw new Error("Invalid Date");
   }
+  const minDate = luxon.DateTime.fromSeconds(1);
+  const maxDate = luxon.DateTime.fromMillis(2147483647 * 1e3);
+  if (isTimeStamp) {
+    if (dt < minDate) {
+      throw new Error(
+        "Atlassian Forge does not support zero or negative timestamps. Allowed range: from '1970-01-01 00:00:01.000000' to '2038-01-19 03:14:07.999999'."
+      );
+    }
+    if (dt > maxDate) {
+      throw new Error(
+        "Atlassian Forge does not support timestamps beyond 2038-01-19 03:14:07.999999. Please use a smaller date within the supported range."
+      );
+    }
+  }
   return dt.toFormat(format);
 }
 function getPrimaryKeys(table2) {
@@ -480,7 +499,9 @@ async function clearExpiredCache(options) {
     );
   } finally {
     const duration = luxon.DateTime.now().toSeconds() - startTime.toSeconds();
-    console.info(`Cleared ${totalRecords} expired cache records in ${duration} seconds`);
+    if (options?.logRawSqlQuery) {
+      console.debug(`Cleared ${totalRecords} expired cache records in ${duration} seconds`);
+    }
   }
 }
 async function getFromCache(query, options) {
@@ -553,7 +574,7 @@ async function saveTableIfInsideCacheContext(table$1) {
     context.tables.add(tableName);
   }
 }
-async function saveQueryLocalCacheQuery(query, rows) {
+async function saveQueryLocalCacheQuery(query, rows, options) {
   const context = localCacheApplicationContext.getStore();
   if (context) {
     if (!context.cache) {
@@ -565,9 +586,15 @@ async function saveQueryLocalCacheQuery(query, rows) {
       sql: sql2.toSQL().sql.toLowerCase(),
       data: rows
     };
+    if (options.logRawSqlQuery) {
+      const q = sql2.toSQL();
+      console.debug(
+        `[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) {
@@ -576,6 +603,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.debug(
+          `[forge-sql-orm][local-cache][HIT] Returned cached result. sql="${q.sql}", params=${JSON.stringify(q.params)}`
+        );
+      }
       return context.cache[key].data;
     }
   }
@@ -1002,28 +1035,23 @@ class ForgeSQLSelectOperations {
   }
 }
 const forgeDriver = async (query, params, method) => {
-  try {
-    if (method == "execute") {
-      const sqlStatement = sql$1.sql.prepare(query);
-      if (params) {
-        sqlStatement.bindParams(...params);
-      }
-      const updateQueryResponseResults = await sqlStatement.execute();
-      let result = updateQueryResponseResults.rows;
-      return { ...result, rows: [result] };
-    } else {
-      const sqlStatement = await sql$1.sql.prepare(query);
-      if (params) {
-        await sqlStatement.bindParams(...params);
-      }
-      const result = await sqlStatement.execute();
-      let rows;
-      rows = result.rows.map((r) => Object.values(r));
-      return { rows };
+  if (method == "execute") {
+    const sqlStatement = sql$1.sql.prepare(query);
+    if (params) {
+      sqlStatement.bindParams(...params);
     }
-  } catch (error) {
-    console.error("SQL Error:", JSON.stringify(error));
-    throw error;
+    const updateQueryResponseResults = await sqlStatement.execute();
+    let result = updateQueryResponseResults.rows;
+    return { ...result, rows: [result] };
+  } else {
+    const sqlStatement = await sql$1.sql.prepare(query);
+    if (params) {
+      await sqlStatement.bindParams(...params);
+    }
+    const result = await sqlStatement.execute();
+    let rows;
+    rows = result.rows.map((r) => Object.values(r));
+    return { rows };
   }
 };
 function injectSqlHints(query, hints) {
@@ -1060,28 +1088,22 @@ function createForgeDriverProxy(options, logRawSqlQuery) {
   return async (query, params, method) => {
     const modifiedQuery = injectSqlHints(query, options);
     if (options && logRawSqlQuery && modifiedQuery !== query) {
-      console.warn("modified query: " + modifiedQuery);
+      console.debug("injected Hints: " + modifiedQuery);
+    }
+    try {
+      return await forgeDriver(modifiedQuery, params, method);
+    } catch (error) {
+      if (logRawSqlQuery) {
+        console.debug("SQL Error:", JSON.stringify(error));
+      }
+      throw error;
     }
-    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;
@@ -1110,8 +1132,8 @@ async function handleSuccessfulExecution(rows, onfulfilled, table2, options, isC
     if (shouldClearCacheOnError(error)) {
       await evictLocalCacheQuery(table2, options);
       if (isCached) {
-        await clearCache(table2, options).catch(() => {
-          console.warn("Ignore cache clear errors");
+        await clearCache(table2, options).catch((e) => {
+          console.warn("Ignore cache clear errors", e);
         });
       } else {
         await saveTableIfInsideCacheContext(table2);
@@ -1173,7 +1195,7 @@ function deleteAndEvictCacheBuilder(db, table2, 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);
     }
@@ -1183,7 +1205,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);
     });
@@ -1192,15 +1214,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);
@@ -1232,7 +1254,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
+              );
             }
           };
         }
@@ -1266,14 +1295,16 @@ function createRawQueryExecutor(db, options, useGlobalCache = false) {
     let sql$12;
     if (sql.isSQLWrapper(query)) {
       const sqlWrapper = query;
-      sql$12 = sqlWrapper.getSQL().toQuery(db.dialect);
+      sql$12 = sqlWrapper.getSQL().toQuery(
+        db.dialect
+      );
     } else {
       sql$12 = {
         sql: query,
         params: []
       };
     }
-    const localCacheResult = await getQueryLocalCacheQuery(sql$12);
+    const localCacheResult = await getQueryLocalCacheQuery(sql$12, options);
     if (localCacheResult) {
       return localCacheResult;
     }
@@ -1284,7 +1315,7 @@ function createRawQueryExecutor(db, options, useGlobalCache = false) {
       }
     }
     const results = await db.execute(query);
-    await saveQueryLocalCacheQuery(sql$12, results);
+    await saveQueryLocalCacheQuery(sql$12, results, options);
     if (useGlobalCache) {
       await setCacheResult(
         { toSQL: () => sql$12 },
@@ -1835,34 +1866,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
    */
@@ -2159,7 +2196,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'");
    * ```
@@ -2180,7 +2217,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'");
    * ```
@@ -2218,7 +2255,7 @@ class ForgeSQLORMImpl {
    *     .from(users)
    *     .groupBy(users.id)
    * );
-   * 
+   *
    * const result = await forgeSQL.with(withQuery)
    *   .select({ userId: withQuery.userId, count: withQuery.count })
    *   .from(withQuery);
@@ -2310,7 +2347,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
    */
@@ -2320,7 +2357,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
    */
@@ -2484,7 +2521,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'");
    * ```
@@ -2505,7 +2542,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'");
    * ```
@@ -2543,7 +2580,7 @@ class ForgeSQLORM {
    *     .from(users)
    *     .groupBy(users.id)
    * );
-   * 
+   *
    * const result = await forgeSQL.with(withQuery)
    *   .select({ userId: withQuery.userId, count: withQuery.count })
    *   .from(withQuery);
@@ -2558,10 +2595,10 @@ const forgeDateTimeString = mysqlCore.customType({
     return "datetime";
   },
   toDriver(value) {
-    return formatDateTime(value, "yyyy-LL-dd' 'HH:mm:ss.SSS");
+    return formatDateTime(value, "yyyy-MM-dd' 'HH:mm:ss.SSS", false);
   },
   fromDriver(value) {
-    const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
+    const format = "yyyy-MM-dd' 'HH:mm:ss.SSS";
     return parseDateTime(value, format);
   }
 });
@@ -2570,10 +2607,10 @@ const forgeTimestampString = mysqlCore.customType({
     return "timestamp";
   },
   toDriver(value) {
-    return formatDateTime(value, "yyyy-LL-dd' 'HH:mm:ss.SSS");
+    return formatDateTime(value, "yyyy-MM-dd' 'HH:mm:ss.SSS", true);
   },
   fromDriver(value) {
-    const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
+    const format = "yyyy-MM-dd' 'HH:mm:ss.SSS";
     return parseDateTime(value, format);
   }
 });
@@ -2582,10 +2619,10 @@ const forgeDateString = mysqlCore.customType({
     return "date";
   },
   toDriver(value) {
-    return formatDateTime(value, "yyyy-LL-dd");
+    return formatDateTime(value, "yyyy-MM-dd", false);
   },
   fromDriver(value) {
-    const format = "yyyy-LL-dd";
+    const format = "yyyy-MM-dd";
     return parseDateTime(value, format);
   }
 });
@@ -2594,7 +2631,7 @@ const forgeTimeString = mysqlCore.customType({
     return "time";
   },
   toDriver(value) {
-    return formatDateTime(value, "HH:mm:ss.SSS");
+    return formatDateTime(value, "HH:mm:ss.SSS", false);
   },
   fromDriver(value) {
     return parseDateTime(value, "HH:mm:ss.SSS");
@@ -2615,7 +2652,7 @@ async function dropSchemaMigrations() {
     const tables = await getTables();
     const dropStatements = generateDropTableStatements(tables, { sequence: true, table: true });
     for (const statement of dropStatements) {
-      console.warn(statement);
+      console.debug(`execute DDL: ${statement}`);
       await sql$1.sql.executeDDL(statement);
     }
     return getHttpResponse(
@@ -2623,8 +2660,8 @@ async function dropSchemaMigrations() {
       "⚠️ All data in these tables has been permanently deleted. This operation cannot be undone."
     );
   } catch (error) {
-    console.error(error);
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+    const errorMessage = error?.debug?.sqlMessage ?? error?.debug?.message ?? error.message ?? "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse(500, errorMessage);
   }
 }
@@ -2640,7 +2677,13 @@ const applySchemaMigrations = async (migration) => {
     const successfulMigrations = await migrations2.run();
     console.info("Migrations applied:", successfulMigrations);
     const migrationList = await sql$1.migrationRunner.list();
-    const migrationHistory = Array.isArray(migrationList) && migrationList.length > 0 ? migrationList.sort((a, b) => a.migratedAt.getTime() - b.migratedAt.getTime()).map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`).join("\n") : "No migrations found";
+    let migrationHistory = "No migrations found";
+    if (Array.isArray(migrationList) && migrationList.length > 0) {
+      const sortedMigrations = migrationList.toSorted(
+        (a, b) => a.migratedAt.getTime() - b.migratedAt.getTime()
+      );
+      migrationHistory = sortedMigrations.map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`).join("\n");
+    }
     console.info("Migrations history:\nid, name, migrated_at\n", migrationHistory);
     return {
       headers: { "Content-Type": ["application/json"] },
@@ -2649,12 +2692,8 @@ const applySchemaMigrations = async (migration) => {
       body: "Migrations successfully executed"
     };
   } catch (error) {
-    try {
-      console.error("Error during migration:", JSON.stringify(error));
-    } catch (e) {
-      console.trace("Error stringify:", e);
-      console.error("Error during migration:", error);
-    }
+    const errorMessage = error?.debug?.sqlMessage ?? error?.debug?.message ?? error.message ?? "Unknown error occurred";
+    console.error("Error during migration:", errorMessage);
     return {
       headers: { "Content-Type": ["application/json"] },
       statusCode: 500,
@@ -2670,8 +2709,8 @@ async function fetchSchemaWebTrigger() {
     const sqlStatements = wrapWithForeignKeyChecks(createTableStatements);
     return getHttpResponse(200, sqlStatements.join(";\n"));
   } catch (error) {
-    console.error(JSON.stringify(error));
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+    const errorMessage = error?.debug?.sqlMessage ?? error?.debug?.message ?? error.message ?? "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse(500, errorMessage);
   }
 }
@@ -2698,7 +2737,7 @@ async function dropTableSchemaMigrations() {
     const tables = await getTables();
     const dropStatements = generateDropTableStatements(tables, { sequence: false, table: true });
     for (const statement of dropStatements) {
-      console.warn(statement);
+      console.debug(`execute DDL: ${statement}`);
       await sql$1.sql.executeDDL(statement);
     }
     return getHttpResponse(
@@ -2706,8 +2745,8 @@ async function dropTableSchemaMigrations() {
       "⚠️ All data in these tables has been permanently deleted. This operation cannot be undone."
     );
   } catch (error) {
-    console.error(error);
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+    const errorMessage = error?.debug?.sqlMessage ?? error?.debug?.message ?? error.message ?? "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse(500, errorMessage);
   }
 }