@mikro-orm/core 7.0.2-dev.14 → 7.0.2-dev.16

package/entity/EntityFactory.js

@@ -5,6 +5,7 @@ import { Reference } from './Reference.js';
 import { helper } from './wrap.js';
 import { EntityHelper } from './EntityHelper.js';
 import { JsonType } from '../types/JsonType.js';
+import { isRaw } from '../utils/RawQueryFragment.js';
 /** @internal Factory responsible for creating, merging, and hydrating entity instances. */
 export class EntityFactory {
     #driver;
@@ -275,9 +276,21 @@ export class EntityFactory {
     }
     assignDefaultValues(entity, meta) {
         for (const prop of meta.props) {
+            if (prop.embedded || [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind)) {
+                continue;
+            }
             if (prop.onCreate) {
                 entity[prop.name] ??= prop.onCreate(entity, this.#em);
             }
+            else if (prop.default != null && !isRaw(prop.default) && entity[prop.name] === undefined) {
+                entity[prop.name] = prop.default;
+            }
+            if (prop.kind === ReferenceKind.EMBEDDED && entity[prop.name]) {
+                const items = prop.array ? entity[prop.name] : [entity[prop.name]];
+                for (const item of items) {
+                    this.assignDefaultValues(item, prop.targetMeta);
+                }
+            }
         }
     }
     hydrate(entity, meta, data, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.2-dev.14",
+  "version": "7.0.2-dev.16",
   "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/unit-of-work/ChangeSetComputer.js

@@ -6,6 +6,7 @@ import { validateEntity } from '../entity/validators.js';
 import { Reference } from '../entity/Reference.js';
 import { PolymorphicRef } from '../entity/PolymorphicRef.js';
 import { ReferenceKind } from '../enums.js';
+import { isRaw } from '../utils/RawQueryFragment.js';
 /** @internal Computes change sets by comparing entity state against original snapshots. */
 export class ChangeSetComputer {
     #comparator;
@@ -83,14 +84,24 @@ export class ChangeSetComputer {
                 (Utils.isScalarReference(entity[prop.name]) && entity[prop.name].unwrap() == null))) {
             entity[prop.name] = prop.onCreate(entity, this.#em);
         }
+        else if (prop.default != null &&
+            !isRaw(prop.default) &&
+            ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+            type === ChangeSetType.CREATE &&
+            entity[prop.name] === undefined) {
+            entity[prop.name] = prop.default;
+        }
         if (prop.onUpdate && type === ChangeSetType.UPDATE) {
             const pairs = map.get(entity) ?? [];
             pairs.push([prop.name, prop.onUpdate(entity, this.#em)]);
             map.set(entity, pairs);
         }
         if (prop.kind === ReferenceKind.EMBEDDED && entity[prop.name]) {
-            for (const embeddedProp of prop.targetMeta.hydrateProps) {
-                this.processPropertyInitializers(entity[prop.name], embeddedProp, type, map, nested || prop.object);
+            const items = prop.array ? entity[prop.name] : [entity[prop.name]];
+            for (const item of items) {
+                for (const embeddedProp of prop.targetMeta.hydrateProps) {
+                    this.processPropertyInitializers(item, embeddedProp, type, map, nested || prop.object);
+                }
             }
         }
     }

package/utils/Utils.js

@@ -129,7 +129,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.0.2-dev.14';
+    static #ORM_VERSION = '7.0.2-dev.16';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */