@mikro-orm/core 6.3.14-dev.32 → 6.3.14-dev.33

package/package.json

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

package/serialization/EntitySerializer.js

@@ -111,7 +111,7 @@ class EntitySerializer {
         const parts = prop.split('.');
         prop = parts[0];
         const wrapped = (0, wrap_1.helper)(entity);
-        const property = wrapped.__meta.properties[prop];
+        const property = wrapped.__meta.properties[prop] ?? { name: prop };
         const serializer = property?.serializer;
         const value = entity[prop];
         // getter method
@@ -127,10 +127,10 @@ class EntitySerializer {
             return serializer(value);
         }
         if (Utils_1.Utils.isCollection(value)) {
-            return this.processCollection(prop, entity, options);
+            return this.processCollection(property, entity, options);
         }
         if (Utils_1.Utils.isEntity(value, true)) {
-            return this.processEntity(prop, entity, wrapped.__platform, options);
+            return this.processEntity(property, entity, wrapped.__platform, options);
         }
         if (Utils_1.Utils.isScalarReference(value)) {
             return value.unwrap();
@@ -158,17 +158,20 @@ class EntitySerializer {
         };
     }
     static processEntity(prop, entity, platform, options) {
-        const child = Reference_1.Reference.unwrapReference(entity[prop]);
+        const child = Reference_1.Reference.unwrapReference(entity[prop.name]);
         const wrapped = (0, wrap_1.helper)(child);
-        const populated = isPopulated(prop, options) && wrapped.isInitialized();
+        const populated = isPopulated(prop.name, options) && wrapped.isInitialized();
         const expand = populated || !wrapped.__managed;
         const meta = wrapped.__meta;
-        const childOptions = this.extractChildOptions(options, prop);
+        const childOptions = this.extractChildOptions(options, prop.name);
         const visible = meta.primaryKeys.filter(prop => isVisible(meta, prop, childOptions));
         if (expand) {
             return this.serialize(child, childOptions);
         }
-        const pk = wrapped.getPrimaryKey(true);
+        let pk = wrapped.getPrimaryKey();
+        if (prop.customType) {
+            pk = prop.customType.toJSON(pk, wrapped.__platform);
+        }
         if (options.forceObject || wrapped.__config.get('serialization').forceObject) {
             return Utils_1.Utils.primaryKeyToObject(meta, pk, visible);
         }
@@ -182,20 +185,24 @@ class EntitySerializer {
         return platform.normalizePrimaryKey(pk);
     }
     static processCollection(prop, entity, options) {
-        const col = entity[prop];
+        const col = entity[prop.name];
         if (!col.isInitialized()) {
             return undefined;
         }
         return col.getItems(false).map(item => {
-            const populated = isPopulated(prop, options);
+            const populated = isPopulated(prop.name, options);
             const wrapped = (0, wrap_1.helper)(item);
             if (populated || !wrapped.__managed) {
-                return this.serialize(item, this.extractChildOptions(options, prop));
+                return this.serialize(item, this.extractChildOptions(options, prop.name));
+            }
+            let pk = wrapped.getPrimaryKey();
+            if (prop.customType) {
+                pk = prop.customType.toJSON(pk, wrapped.__platform);
             }
             if (options.forceObject || wrapped.__config.get('serialization').forceObject) {
-                return Utils_1.Utils.primaryKeyToObject(wrapped.__meta, wrapped.getPrimaryKey(true));
+                return Utils_1.Utils.primaryKeyToObject(wrapped.__meta, pk);
             }
-            return (0, wrap_1.helper)(item).getPrimaryKey();
+            return pk;
         });
     }
 }

package/serialization/EntityTransformer.js

@@ -108,7 +108,7 @@ class EntityTransformer {
     }
     static processProperty(prop, entity, raw, populated) {
         const wrapped = (0, wrap_1.helper)(entity);
-        const property = wrapped.__meta.properties[prop];
+        const property = wrapped.__meta.properties[prop] ?? { name: prop };
         const serializer = property?.serializer;
         const value = entity[prop];
         // getter method
@@ -123,10 +123,10 @@ class EntityTransformer {
             return serializer(value);
         }
         if (Utils_1.Utils.isCollection(value)) {
-            return EntityTransformer.processCollection(prop, entity, raw, populated);
+            return EntityTransformer.processCollection(property, entity, raw, populated);
         }
         if (Utils_1.Utils.isEntity(value, true)) {
-            return EntityTransformer.processEntity(prop, entity, wrapped.__platform, raw, populated);
+            return EntityTransformer.processEntity(property, entity, wrapped.__platform, raw, populated);
         }
         if (Utils_1.Utils.isScalarReference(value)) {
             return value.unwrap();
@@ -151,7 +151,7 @@ class EntityTransformer {
         return value;
     }
     static processEntity(prop, entity, platform, raw, populated) {
-        const child = entity[prop];
+        const child = entity[prop.name];
         const wrapped = (0, wrap_1.helper)(child);
         const meta = wrapped.__meta;
         const visible = meta.primaryKeys.filter(prop => isVisible(meta, prop));
@@ -170,7 +170,10 @@ class EntityTransformer {
         if (wrapped.isInitialized() && isPopulated() && child !== entity) {
             return (0, wrap_1.wrap)(child).toJSON();
         }
-        const pk = wrapped.getPrimaryKey(true);
+        let pk = wrapped.getPrimaryKey();
+        if (prop.customType) {
+            pk = prop.customType.toJSON(pk, wrapped.__platform);
+        }
         if (wrapped.__config.get('serialization').forceObject) {
             return Utils_1.Utils.primaryKeyToObject(meta, pk, visible);
         }
@@ -184,7 +187,7 @@ class EntityTransformer {
         return platform.normalizePrimaryKey(pk);
     }
     static processCollection(prop, entity, raw, populated) {
-        const col = entity[prop];
+        const col = entity[prop.name];
         if (raw && col.isInitialized(true)) {
             return col.map(item => (0, wrap_1.helper)(item).toPOJO());
         }
@@ -193,13 +196,18 @@ class EntityTransformer {
         }
         if (col.isInitialized()) {
             const wrapped = (0, wrap_1.helper)(entity);
-            if (wrapped.__config.get('serialization').forceObject) {
-                return col.map(item => {
-                    const wrapped = (0, wrap_1.helper)(item);
-                    return Utils_1.Utils.primaryKeyToObject(wrapped.__meta, wrapped.getPrimaryKey(true));
-                });
-            }
-            return col.map(i => (0, wrap_1.helper)(i).getPrimaryKey(true));
+            const forceObject = wrapped.__config.get('serialization').forceObject;
+            return col.map(item => {
+                const wrapped = (0, wrap_1.helper)(item);
+                const pk = wrapped.getPrimaryKey();
+                if (prop.customType) {
+                    return prop.customType.toJSON(pk, wrapped.__platform);
+                }
+                if (forceObject) {
+                    return Utils_1.Utils.primaryKeyToObject(wrapped.__meta, pk);
+                }
+                return pk;
+            });
         }
         return undefined;
     }