@mikro-orm/knex 6.0.0-dev.270 → 6.0.0-dev.271

package/AbstractSqlDriver.js

@@ -231,31 +231,41 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            const props = ref
+            const targetProps = ref
                 ? meta2.getPrimaryProps()
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
-            for (const prop1 of props) {
-                if (prop1.fieldNames.length > 1) { // composite keys
-                    const fk = prop1.fieldNames.map(name => root[`${relationAlias}__${name}`]);
-                    relationPojo[prop1.name] = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop1);
+            for (const prop of targetProps) {
+                if (prop.fieldNames.length > 1) { // composite keys
+                    const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
+                    relationPojo[prop.name] = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop);
                 }
-                else if (prop1.runtimeType === 'Date') {
-                    const alias = `${relationAlias}__${prop1.fieldNames[0]}`;
-                    relationPojo[prop1.name] = (typeof root[alias] === 'string' ? new Date(root[alias]) : root[alias]);
+                else if (prop.runtimeType === 'Date') {
+                    const alias = `${relationAlias}__${prop.fieldNames[0]}`;
+                    relationPojo[prop.name] = (typeof root[alias] === 'string' ? new Date(root[alias]) : root[alias]);
                 }
                 else {
-                    const alias = `${relationAlias}__${prop1.fieldNames[0]}`;
-                    relationPojo[prop1.name] = root[alias];
+                    const alias = `${relationAlias}__${prop.fieldNames[0]}`;
+                    relationPojo[prop.name] = root[alias];
+                    if (prop.kind === core_1.ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
+                        const item = (0, core_1.parseJsonSafe)(relationPojo[prop.name]);
+                        if (Array.isArray(item)) {
+                            relationPojo[prop.name] = item.map(row => row == null ? row : this.comparator.mapResult(prop.type, row));
+                        }
+                        else {
+                            relationPojo[prop.name] = item == null ? item : this.comparator.mapResult(prop.type, item);
+                        }
+                    }
                 }
             }
             // properties can be mapped to multiple places, e.g. when sharing a column in multiple FKs,
             // so we need to delete them after everything is mapped from given level
-            for (const prop1 of props) {
-                prop1.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
+            for (const prop of targetProps) {
+                prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
             }
             if (ref) {
                 const tmp = Object.values(relationPojo);
-                relationPojo = meta2.compositePK ? tmp : tmp[0];
+                /* istanbul ignore next */
+                relationPojo = (meta2.compositePK ? tmp : tmp[0]);
             }
             if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(prop.kind)) {
                 result[prop.name] ??= [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.270",
+  "version": "6.0.0-dev.271",
   "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",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^5.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.270"
+    "@mikro-orm/core": "6.0.0-dev.271"
   }
 }