fix(core): map embedded constructor parameters

mikro-orm · May 21, 2024 · 24f3ee6 · 24f3ee6
1 parent 0837e0f
commit 24f3ee6
Show file tree

Hide file tree

Showing 5 changed files with 402 additions and 74 deletions.
diff --git a/packages/core/src/hydration/ObjectHydrator.ts b/packages/core/src/hydration/ObjectHydrator.ts
@@ -266,18 +266,31 @@ export class ObjectHydrator extends Hydrator {
 
       ret.push(`  if (${createCond(prop, dataKey).join(' || ')}) {`);
 
+      if (prop.object) {
+        ret.push(`    const embeddedData = data${dataKey};`);
+      } else {
+        ret.push(`    const embeddedData = {`);
+
+        for (const childProp of Object.values(prop.embeddedProps)) {
+          const key = childProp.embedded![1].match(/^\w+$/) ? childProp.embedded![1] : `'${childProp.embedded![1]}'`;
+          ret.push(`      ${key}: data${this.wrap(childProp.name)},`);
+        }
+
+        ret.push(`    };`);
+      }
+
       if (prop.targetMeta?.polymorphs) {
         prop.targetMeta.polymorphs!.forEach(meta => {
           const childProp = prop.embeddedProps[prop.targetMeta!.discriminatorColumn!];
           const childDataKey = prop.object ? dataKey + this.wrap(childProp.embedded![1]) : this.wrap(childProp.name);
           // weak comparison as we can have numbers that might have been converted to strings due to being object keys
           ret.push(`    if (data${childDataKey} == '${meta.discriminatorValue}' && entity${entityKey} == null) {`);
-          ret.push(`      entity${entityKey} = factory.createEmbeddable('${meta.className}', data${prop.object ? dataKey : ''}, { newEntity, convertCustomTypes });`);
+          ret.push(`      entity${entityKey} = factory.createEmbeddable('${meta.className}', embeddedData, { newEntity, convertCustomTypes });`);
           ret.push(`    }`);
         });
       } else {
         ret.push(`    if (entity${entityKey} == null) {`);
-        ret.push(`      entity${entityKey} = factory.createEmbeddable('${prop.targetMeta!.className}', data${prop.object ? dataKey : ''}, { newEntity, convertCustomTypes });`);
+        ret.push(`      entity${entityKey} = factory.createEmbeddable('${prop.targetMeta!.className}', embeddedData, { newEntity, convertCustomTypes });`);
         ret.push(`    }`);
       }