@mikro-orm/core 6.2.10-dev.84 → 6.2.10-dev.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.2.10-dev.84",
+  "version": "6.2.10-dev.85",
   "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.2.10-dev.84",
+    "mikro-orm": "6.2.10-dev.85",
     "reflect-metadata": "0.2.2"
   }
 }

package/platforms/Platform.d.ts

@@ -148,7 +148,7 @@ export declare abstract class Platform {
     getFullTextIndexExpression(indexName: string, schemaName: string | undefined, tableName: string, columns: SimpleColumnMeta[]): string;
     convertsJsonAutomatically(): boolean;
     convertJsonToDatabaseValue(value: unknown, context?: TransformContext): unknown;
-    convertJsonToJSValue(value: unknown): unknown;
+    convertJsonToJSValue(value: unknown, prop: EntityProperty): unknown;
     convertDateToJSValue(value: string | Date): string;
     convertIntervalToJSValue(value: string): unknown;
     convertIntervalToDatabaseValue(value: unknown): unknown;

package/platforms/Platform.js

@@ -282,7 +282,11 @@ class Platform {
     convertJsonToDatabaseValue(value, context) {
         return JSON.stringify(value);
     }
-    convertJsonToJSValue(value) {
+    convertJsonToJSValue(value, prop) {
+        const isObjectEmbedded = prop.embedded && prop.object;
+        if ((this.convertsJsonAutomatically() || isObjectEmbedded) && ['json', 'jsonb', this.getJsonDeclarationSQL()].includes(prop.columnTypes[0])) {
+            return value;
+        }
         return (0, Utils_1.parseJsonSafe)(value);
     }
     convertDateToJSValue(value) {

package/types/JsonType.js

@@ -16,7 +16,7 @@ class JsonType extends Type_1.Type {
         return key + platform.castColumn(this.prop);
     }
     convertToJSValue(value, platform) {
-        return platform.convertJsonToJSValue(value);
+        return platform.convertJsonToJSValue(value, this.prop);
     }
     getColumnType(prop, platform) {
         return platform.getJsonDeclarationSQL();