@mikro-orm/core 7.0.8-dev.7 → 7.0.8-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.8-dev.7",
+  "version": "7.0.8-dev.8",
   "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/utils/EntityComparator.d.ts

@@ -70,6 +70,7 @@ export declare class EntityComparator {
      */
     private shouldSerialize;
     private getEmbeddedPropertySnapshot;
+    private getInlineEmbeddedNullLines;
     private registerCustomType;
     private getPropertySnapshot;
     /**

package/utils/EntityComparator.js

@@ -457,15 +457,7 @@ export class EntityComparator {
         else {
             ret += `${padding}if (${nullCond}) {\n`;
             ret +=
-                meta.props
-                    .filter(p => p.embedded?.[0] === prop.name &&
-                    // object for JSON embeddable
-                    (p.object || p.persist !== false))
-                    .map(childProp => {
-                    const childDataKey = meta.embeddable || prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-                    return `${padding}  ret${childDataKey} = null;`;
-                })
-                    .join('\n') + `\n`;
+                this.getInlineEmbeddedNullLines(meta, prop.name, padding, dataKey, !!(meta.embeddable || prop.object)).join('\n') + `\n`;
             ret += `${padding}}\n`;
         }
         const cond = `entity${path.map(k => this.wrap(k)).join('')} != null`;
@@ -515,6 +507,17 @@ export class EntityComparator {
         }
         return `${ret}${padding}}`;
     }
+    getInlineEmbeddedNullLines(meta, parentName, padding, dataKey, useEmbeddedKey) {
+        return meta.props
+            .filter(p => p.embedded?.[0] === parentName && (p.object || p.persist !== false))
+            .flatMap(childProp => {
+            const childDataKey = useEmbeddedKey ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+            if (childProp.kind === ReferenceKind.EMBEDDED && !childProp.object) {
+                return this.getInlineEmbeddedNullLines(meta, childProp.name, padding, childDataKey, useEmbeddedKey);
+            }
+            return [`${padding}  ret${childDataKey} = null;`];
+        });
+    }
     registerCustomType(prop, context) {
         const convertorKey = this.safeKey(prop.name);
         context.set(`convertToDatabaseValue_${convertorKey}`, (val) => {

package/utils/Utils.js

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