@mikro-orm/core 6.4.13 → 6.4.14-dev.0

package/EntityManager.d.ts

@@ -486,7 +486,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * @internal
      */
     tryCache<T extends object, R>(entityName: string, config: boolean | number | [string, number] | undefined, key: unknown, refresh?: boolean, merge?: boolean): Promise<{
-        data?: R;
+        data?: R | null;
         key: string;
     } | undefined>;
     /**

package/EntityManager.js

@@ -529,14 +529,16 @@ class EntityManager {
         options.populate = await em.preparePopulate(entityName, options);
         const cacheKey = em.cacheKey(entityName, options, 'em.findOne', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
-        if (cached?.data) {
-            await em.entityLoader.populate(entityName, [cached.data], options.populate, {
-                ...options,
-                ...em.getPopulateWhere(where, options),
-                convertCustomTypes: false,
-                ignoreLazyScalarProperties: true,
-                lookup: false,
-            });
+        if (cached?.data !== undefined) {
+            if (cached.data) {
+                await em.entityLoader.populate(entityName, [cached.data], options.populate, {
+                    ...options,
+                    ...em.getPopulateWhere(where, options),
+                    convertCustomTypes: false,
+                    ignoreLazyScalarProperties: true,
+                    lookup: false,
+                });
+            }
             return cached.data;
         }
         options = { ...options };
@@ -1683,6 +1685,9 @@ class EntityManager {
         const em = this.getContext();
         const cacheKey = Array.isArray(config) ? config[0] : JSON.stringify(key);
         const cached = await em.resultCache.get(cacheKey);
+        if (cached === null) {
+            return { key: cacheKey, data: null };
+        }
         if (cached) {
             let data;
             if (Array.isArray(cached) && merge) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.13",
+  "version": "6.4.14-dev.0",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.13",
+    "mikro-orm": "6.4.14-dev.0",
     "reflect-metadata": "0.2.2"
   }
 }