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

package/EntityManager.js

@@ -1261,7 +1261,7 @@ class EntityManager {
         delete options.orderBy;
         const cacheKey = em.cacheKey(entityName, options, 'em.count', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey);
-        if (cached?.data) {
+        if (cached?.data !== undefined) {
             return cached.data;
         }
         const count = await em.driver.count(entityName, where, { ctx: em.transactionContext, ...options });
@@ -1685,34 +1685,31 @@ 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) {
-                data = cached.map(item => em.entityFactory.create(entityName, item, {
-                    merge: true,
-                    convertCustomTypes: true,
-                    refresh,
-                    recomputeSnapshot: true,
-                }));
-            }
-            else if (utils_1.Utils.isObject(cached) && merge) {
-                data = em.entityFactory.create(entityName, cached, {
-                    merge: true,
-                    convertCustomTypes: true,
-                    refresh,
-                    recomputeSnapshot: true,
-                });
-            }
-            else {
-                data = cached;
-            }
-            await em.unitOfWork.dispatchOnLoadEvent();
-            return { key: cacheKey, data };
+        if (!cached) {
+            return { key: cacheKey, data: cached };
+        }
+        let data;
+        if (Array.isArray(cached) && merge) {
+            data = cached.map(item => em.entityFactory.create(entityName, item, {
+                merge: true,
+                convertCustomTypes: true,
+                refresh,
+                recomputeSnapshot: true,
+            }));
         }
-        return { key: cacheKey };
+        else if (utils_1.Utils.isObject(cached) && merge) {
+            data = em.entityFactory.create(entityName, cached, {
+                merge: true,
+                convertCustomTypes: true,
+                refresh,
+                recomputeSnapshot: true,
+            });
+        }
+        else {
+            data = cached;
+        }
+        await em.unitOfWork.dispatchOnLoadEvent();
+        return { key: cacheKey, data };
     }
     /**
      * @internal

package/enums.d.ts

@@ -66,7 +66,7 @@ export declare enum QueryOrderNumeric {
     ASC = 1,
     DESC = -1
 }
-export type QueryOrderKeysFlat = QueryOrder | QueryOrderNumeric | keyof typeof QueryOrder;
+export type QueryOrderKeysFlat = QueryOrder | QueryOrderNumeric | `${QueryOrder}`;
 export type QueryOrderKeys<T> = QueryOrderKeysFlat | QueryOrderMap<T>;
 export type QueryOrderMap<T> = {
     [K in EntityKey<T>]?: QueryOrderKeys<ExpandProperty<T[K]>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.14-dev.0",
+  "version": "6.4.14-dev.10",
   "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.14-dev.0",
+    "mikro-orm": "6.4.14-dev.10",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/EntityComparator.js

@@ -610,7 +610,7 @@ class EntityComparator {
      * perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison
      */
     static isComparable(prop, root) {
-        const virtual = prop.persist === false || prop.generated;
+        const virtual = prop.persist === false || (prop.generated && !prop.primary);
         const inverse = prop.kind === enums_1.ReferenceKind.ONE_TO_ONE && !prop.owner;
         const discriminator = prop.name === root.discriminatorColumn;
         const collection = prop.kind === enums_1.ReferenceKind.ONE_TO_MANY || prop.kind === enums_1.ReferenceKind.MANY_TO_MANY;