@mikro-orm/core 7.2.8-dev.1 → 7.2.8-dev.2

package/EntityManager.js

@@ -19,6 +19,23 @@ import { TransactionEventBroadcaster } from './events/TransactionEventBroadcaste
 import { MetadataError, OptimisticLockError, ValidationError } from './errors.js';
 import { applyPopulateHints, getLoadingStrategy } from './entity/utils.js';
 import { TransactionManager } from './utils/TransactionManager.js';
+// JSON loses RegExp patterns, `raw()` params and `raw()` keys (symbols); `this[key]` is the value before `toJSON()`
+function cacheKeyReplacer(key, value) {
+    const original = this[key];
+    if (original instanceof RegExp) {
+        return { regexp: original.source, flags: original.flags };
+    }
+    if (isRaw(original)) {
+        return { sql: original.sql, params: original.params };
+    }
+    if (Raw.hasObjectFragments(value)) {
+        return Utils.getObjectQueryKeys(value).map(k => [
+            Raw.getKnownFragment(k) ?? k,
+            value[k],
+        ]);
+    }
+    return value;
+}
 /**
  * The EntityManager is the central access point to ORM functionality. It is a facade to all different ORM subsystems
  * such as UnitOfWork, Query Language, and Repository API.
@@ -2462,7 +2479,7 @@ export class EntityManager {
             ? em.#sessionContext
                 ? `${config[0]}|${JSON.stringify(em.#sessionContext)}`
                 : config[0]
-            : JSON.stringify(key);
+            : JSON.stringify(key, cacheKeyReplacer);
         const cached = await em.#resultCache.get(cacheKey);
         if (!cached) {
             return { key: cacheKey, data: cached };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.8-dev.1",
+  "version": "7.2.8-dev.2",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.8-dev.1';
+    static #ORM_VERSION = '7.2.8-dev.2';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;