@mikro-orm/core 7.1.0-dev.22 → 7.1.0-dev.24

package/EntityManager.js

@@ -1179,9 +1179,6 @@ export class EntityManager {
                 helper(data).setSchema(options.schema);
             }
             if (!helper(data).__managed) {
-                // the entity might have been created via `em.create()`, which adds it to the persist stack automatically
-                em.#unitOfWork.getPersistStack().delete(data);
-                // it can be also in the identity map if it had a PK value already
                 em.#unitOfWork.unsetIdentity(data);
             }
             const meta = helper(data).__meta;
@@ -1270,9 +1267,6 @@ export class EntityManager {
                     helper(row).setSchema(options.schema);
                 }
                 if (!helper(row).__managed) {
-                    // the entity might have been created via `em.create()`, which adds it to the persist stack automatically
-                    em.#unitOfWork.getPersistStack().delete(row);
-                    // it can be also in the identity map if it had a PK value already
                     em.#unitOfWork.unsetIdentity(row);
                 }
                 const payload = em.#comparator.prepareEntity(row);

package/metadata/MetadataDiscovery.js

@@ -1268,7 +1268,10 @@ export class MetadataDiscovery {
         if (!rootProp || rootProp.kind !== prop.kind) {
             return false;
         }
-        if (prop.kind !== ReferenceKind.MANY_TO_ONE && prop.kind !== ReferenceKind.ONE_TO_ONE) {
+        if (prop.kind !== ReferenceKind.MANY_TO_ONE &&
+            prop.kind !== ReferenceKind.ONE_TO_ONE &&
+            prop.kind !== ReferenceKind.ONE_TO_MANY &&
+            prop.kind !== ReferenceKind.MANY_TO_MANY) {
             return false;
         }
         const aRoot = this.#metadata.getByClassName(prop.type, false)?.root;
@@ -1324,7 +1327,14 @@ export class MetadataDiscovery {
             // cleared implicitly when the first child claims the root property via
             // addProperty below, so subsequent children correctly trigger renaming.
             const typesMatch = rootProp?.type === prop.type || rootProp?.stiMerged === true || narrowedRelationOverride;
+            // Inverse-side relations (1:m, inverse m:n) have no FK column on this
+            // entity, so the rename branch — which exists to disambiguate physical
+            // columns shared across STI children — doesn't apply. Skipping it also
+            // avoids crashing on `[...rootProp.fieldNames]` since fieldNames is
+            // never populated for inverse-side properties.
+            const isInverseSideRelation = prop.kind === ReferenceKind.ONE_TO_MANY || (prop.kind === ReferenceKind.MANY_TO_MANY && !prop.owner);
             if (rootProp &&
+                !isInverseSideRelation &&
                 (!typesMatch ||
                     (rootProp.fieldNames && prop.fieldNames && !compareArrays(rootProp.fieldNames, prop.fieldNames)))) {
                 const name = newProp.name;
@@ -1379,6 +1389,14 @@ export class MetadataDiscovery {
             if (narrowedRelationOverride) {
                 return;
             }
+            // STI siblings can declare the same property name on inverse-side relations
+            // pointing to disjoint targets (e.g. `Dog.items → DogItem` and
+            // `Cat.items → CatItem` with no shared base). There's no physical column
+            // to manage at root, and propagating would clobber the first child's
+            // declaration; each child keeps its local typed property instead.
+            if (isInverseSideRelation && rootProp && rootProp.type !== prop.type) {
+                return;
+            }
             meta.root.addProperty(newProp);
         });
         meta.tableName = meta.root.tableName;
@@ -1786,6 +1804,7 @@ export class MetadataDiscovery {
             prop.customType &&
             !(prop.customType instanceof t.array) &&
             !(prop.customType instanceof t.enumArray) &&
+            !(prop.customType instanceof t.json) &&
             prop.kind === ReferenceKind.SCALAR) {
             const innerType = prop.customType;
             innerType.platform = this.#platform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.0-dev.22",
+  "version": "7.1.0-dev.24",
   "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/serialization/EntitySerializer.js

@@ -16,7 +16,8 @@ function isVisible(meta, propName, options) {
     if (Array.isArray(options.fields) && options.fields.length > 0 && !matchesPath(options.fields, propName)) {
         return false;
     }
-    if (Array.isArray(options.populate) && matchesPath(options.populate, propName)) {
+    if (Array.isArray(options.populate) &&
+        options.populate.find(item => item === propName || item.startsWith(propName + '.'))) {
         return true;
     }
     if (options.exclude?.find(item => item === propName)) {

package/unit-of-work/UnitOfWork.js

@@ -474,6 +474,9 @@ export class UnitOfWork {
     }
     unsetIdentity(entity) {
         this.#identityMap.delete(entity);
+        this.#persistStack.delete(entity);
+        this.#removeStack.delete(entity);
+        this.#orphanRemoveStack.delete(entity);
         const wrapped = helper(entity);
         const serializedPK = wrapped.getSerializedPrimaryKey();
         // remove references of this entity in all managed entities, otherwise flushing could reinsert the entity

package/utils/Utils.js

@@ -141,7 +141,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.1.0-dev.22';
+    static #ORM_VERSION = '7.1.0-dev.24';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */