@mikro-orm/core 6.4.14-dev.2 → 6.4.14-dev.20

package/EntityManager.js

@@ -710,6 +710,7 @@ class EntityManager {
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
+                schema: options.schema,
             });
             em.getHydrator().hydrate(entity, meta, data2, em.entityFactory, 'full', false, true);
         }
@@ -891,6 +892,7 @@ class EntityManager {
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
+                schema: options.schema,
             });
             for (const [entity, cond] of loadPK.entries()) {
                 const row = data2.find(row => {
@@ -1261,7 +1263,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 +1687,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,
+            }));
+        }
+        else if (utils_1.Utils.isObject(cached) && merge) {
+            data = em.entityFactory.create(entityName, cached, {
+                merge: true,
+                convertCustomTypes: true,
+                refresh,
+                recomputeSnapshot: true,
+            });
         }
-        return { key: cacheKey };
+        else {
+            data = cached;
+        }
+        await em.unitOfWork.dispatchOnLoadEvent();
+        return { key: cacheKey, data };
     }
     /**
      * @internal

package/decorators/ManyToOne.d.ts

@@ -27,4 +27,6 @@ export interface ManyToOneOptions<Owner, Target> extends ReferenceOptions<Owner,
     updateRule?: 'cascade' | 'no action' | 'set null' | 'set default' | AnyString;
     /** Set the constraint type. Immediate constraints are checked for each statement, while deferred ones are only checked at the end of the transaction. Only for postgres unique constraints. */
     deferMode?: DeferMode | `${DeferMode}`;
+    /** Set a custom foreign key constraint name, overriding NamingStrategy.indexName(). */
+    foreignKeyName?: string;
 }

package/decorators/OneToOne.d.ts

@@ -21,4 +21,6 @@ export interface OneToOneOptions<Owner, Target> extends Partial<Omit<OneToManyOp
     updateRule?: 'cascade' | 'no action' | 'set null' | 'set default' | AnyString;
     /** Set the constraint type. Immediate constraints are checked for each statement, while deferred ones are only checked at the end of the transaction. Only for postgres unique constraints. */
     deferMode?: DeferMode | `${DeferMode}`;
+    /** Set a custom foreign key constraint name, overriding NamingStrategy.indexName(). */
+    foreignKeyName?: string;
 }

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/metadata/MetadataDiscovery.js

@@ -264,7 +264,8 @@ class MetadataDiscovery {
                 // initialize global metadata for given entity
                 MetadataStorage_1.MetadataStorage.getMetadata(entity.meta.className, filepath);
             }
-            return entity;
+            const meta = Utils_1.Utils.copy(entity.meta, false);
+            return EntitySchema_1.EntitySchema.fromMetadata(meta);
         }
         const path = entity[MetadataStorage_1.MetadataStorage.PATH_SYMBOL];
         if (path) {
@@ -1137,6 +1138,9 @@ class MetadataDiscovery {
                 prop.runtimeType ??= prop.customType.runtimeType;
             }
         }
+        else if (prop.runtimeType === 'object') {
+            prop.runtimeType = mappedType.runtimeType;
+        }
         else {
             prop.runtimeType ??= mappedType.runtimeType;
         }

package/package.json

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

package/typings.d.ts

@@ -381,6 +381,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     optional?: boolean;
     ignoreSchemaChanges?: ('type' | 'extra' | 'default')[];
     deferMode?: DeferMode;
+    foreignKeyName?: string;
 }
 export declare class EntityMetadata<T = any> {
     private static counter;

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;