@mikro-orm/core 6.6.14-dev.2 → 6.6.14-dev.3

package/EntityManager.js

@@ -1066,9 +1066,6 @@ class EntityManager {
                 (0, entity_1.helper)(data).setSchema(options.schema);
             }
             if (!(0, entity_1.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 = (0, entity_1.helper)(data).__meta;
@@ -1106,9 +1103,6 @@ class EntityManager {
                     (0, entity_1.helper)(row).setSchema(options.schema);
                 }
                 if (!(0, entity_1.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);
@@ -1589,8 +1583,13 @@ class EntityManager {
             return [];
         }
         const meta = this.metadata.find(entityName);
-        // infer populate hint if only `fields` are available
-        if (!options.populate && options.fields) {
+        // infer populate hints from `fields` when present; merge with explicit `populate` if both are set
+        const fields = options.fields ? this.buildFields(options.fields) : undefined;
+        const populateArray = Array.isArray(options.populate) ? options.populate : undefined;
+        const hasNestedFields = fields?.some(f => f.includes('.')) ?? false;
+        const shouldInfer = fields !== undefined && options.populate === undefined;
+        const shouldMerge = fields !== undefined && populateArray !== undefined && populateArray.length > 0 && hasNestedFields;
+        if (shouldInfer || shouldMerge) {
             // we need to prune the `populate` hint from to-one relations, as partially loading them does not require their population, we want just the FK
             const pruneToOneRelations = (meta, fields) => {
                 const ret = [];
@@ -1621,7 +1620,16 @@ class EntityManager {
                 }
                 return utils_1.Utils.unique(ret);
             };
-            options.populate = pruneToOneRelations(meta, this.buildFields(options.fields));
+            const fromFields = pruneToOneRelations(meta, fields);
+            if (shouldInfer) {
+                options.populate = fromFields;
+            }
+            else {
+                // with an explicit populate, only nested paths (e.g. `item.id`) need to be merged in — they
+                // require a JOIN to access sub-fields, whereas bare names are already handled by the driver
+                const extras = fromFields.filter(f => f.includes('.'));
+                options.populate = [...populateArray, ...extras];
+            }
         }
         if (!options.populate) {
             const populate = this.entityLoader.normalizePopulate(entityName, [], options.strategy, true, options.exclude);

package/entity/EntityFactory.js

@@ -247,6 +247,9 @@ class EntityFactory {
     }
     assignDefaultValues(entity, meta) {
         for (const prop of meta.props) {
+            if (prop.getter && !prop.setter) {
+                continue;
+            }
             if (prop.onCreate) {
                 entity[prop.name] ??= prop.onCreate(entity, this.em);
             }

package/package.json

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

package/serialization/EntitySerializer.js

@@ -12,7 +12,7 @@ function isVisible(meta, propName, options) {
     if (options.groups && prop?.groups) {
         return prop.groups.some(g => options.groups.includes(g));
     }
-    if (Array.isArray(options.populate) && options.populate?.find(item => item === propName || item.startsWith(propName + '.') || item === '*')) {
+    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

@@ -381,6 +381,9 @@ class UnitOfWork {
     }
     unsetIdentity(entity) {
         this.identityMap.delete(entity);
+        this.persistStack.delete(entity);
+        this.removeStack.delete(entity);
+        this.orphanRemoveStack.delete(entity);
         const wrapped = (0, entity_1.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

@@ -688,8 +688,9 @@ class Utils {
         // In some situations (e.g. swc 1.3.4+), the presence of a source map can obscure the call to
         // __decorate(), replacing it with the constructor name. To support these cases we look for
         // Reflect.decorate() as well. Also when babel is used, we need to check
-        // the `_applyDecoratedDescriptor` method instead.
-        let line = stack.findIndex(line => line.match(/__decorate|Reflect\.decorate|_applyDecoratedDescriptor/));
+        // the `_applyDecoratedDescriptor` method instead. TypeScript 5+ emits `__esDecorate`
+        // (inlined into the user file) for TC39 stage-3 native decorators.
+        let line = stack.findIndex(line => line.match(/__decorate|__esDecorate|Reflect\.decorate|_applyDecoratedDescriptor/));
         // bun does not have those lines at all, only the DecorateProperty/DecorateConstructor,
         // but those are also present in node, so we need to check this only if they weren't found.
         if (line === -1) {