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

package/naming-strategy/AbstractNamingStrategy.d.ts

@@ -1,4 +1,5 @@
 import type { NamingStrategy } from './NamingStrategy';
+import { type ReferenceKind } from '../enums';
 export declare abstract class AbstractNamingStrategy implements NamingStrategy {
     getClassName(file: string, separator?: string): string;
     classToMigrationName(timestamp: string, customMigrationName?: string): string;
@@ -17,6 +18,10 @@ export declare abstract class AbstractNamingStrategy implements NamingStrategy {
      */
     enumValueToEnumProperty(enumValue: string, columnName: string, tableName: string, schemaName?: string): string;
     aliasName(entityName: string, index: number): string;
+    /**
+     * @inheritDoc
+     */
+    inverseSideName(entityName: string, propertyName: string, kind: ReferenceKind): string;
     abstract classToTableName(entityName: string): string;
     abstract joinColumnName(propertyName: string): string;
     abstract joinKeyColumnName(entityName: string, referencedColumnName?: string): string;

package/naming-strategy/AbstractNamingStrategy.js

@@ -63,5 +63,18 @@ class AbstractNamingStrategy {
         // Take only the first letter of the prefix to keep character counts down since some engines have character limits
         return entityName.charAt(0).toLowerCase() + index;
     }
+    /**
+     * @inheritDoc
+     */
+    inverseSideName(entityName, propertyName, kind) {
+        if (kind === 'm:n') {
+            return propertyName + 'Inverse';
+        }
+        const suffix = kind === '1:m' && !entityName.endsWith('Collection') ? 'Collection' : '';
+        if (entityName.length === 1) {
+            return entityName[0].toLowerCase() + suffix;
+        }
+        return entityName[0].toLowerCase() + entityName.substring(1) + suffix;
+    }
 }
 exports.AbstractNamingStrategy = AbstractNamingStrategy;

package/naming-strategy/NamingStrategy.d.ts

@@ -1,3 +1,4 @@
+import type { ReferenceKind } from '../enums';
 export interface NamingStrategy {
     /**
      * Return a name of the class based on its file name
@@ -62,7 +63,7 @@ export interface NamingStrategy {
      */
     joinKeyColumnName(entityName: string, referencedColumnName?: string, composite?: boolean): string;
     /**
-     * Returns key/constraint name for given type. Some drivers might not support all the types (e.g. mysql and sqlite enforce the PK name).
+     * Returns key/constraint name for the given type. Some drivers might not support all the types (e.g. mysql and sqlite enforce the PK name).
      */
     indexName(tableName: string, columns: string[], type: 'primary' | 'foreign' | 'unique' | 'index' | 'sequence' | 'check'): string;
     /**
@@ -70,4 +71,8 @@ export interface NamingStrategy {
      * ensured via appended index parameter. It is optional to use it as long as you ensure it will be unique.
      */
     aliasName(entityName: string, index: number): string;
+    /**
+     * Returns the name of the inverse side property. Used in the `EntityGenerator` with `bidirectionalRelations` option.
+     */
+    inverseSideName(entityName: string, propertyName: string, kind: ReferenceKind): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.2.10-dev.83",
+  "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.83",
+    "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();