@mikro-orm/core 7.0.7-dev.13 → 7.0.7-dev.15

package/entity/defineEntity.d.ts

@@ -706,6 +706,9 @@ type MaybeScalarRef<Value, Options> = Options extends {
 } ? Value : Options extends {
     ref: true;
 } ? ScalarReference<Value> : Value;
+type IsAllPropsOpt<T> = [Exclude<keyof T, symbol>] extends [never] ? false : {
+    [K in Exclude<keyof T, symbol>]-?: T[K] extends Opt ? never : K;
+}[Exclude<keyof T, symbol>] extends never ? true : false;
 type MaybeOpt<Value, Options> = Options extends {
     mapToPk: true;
 } ? Value extends Opt<infer OriginalValue> ? OriginalValue : Value : Options extends {
@@ -722,7 +725,9 @@ type MaybeOpt<Value, Options> = Options extends {
     version: true;
 } | {
     formula: string | ((...args: any[]) => any);
-} ? Opt<NonNullable<Value>> | Extract<Value, null | undefined> : Value;
+} ? Opt<NonNullable<Value>> | Extract<Value, null | undefined> : Options extends {
+    kind: 'embedded';
+} ? IsAllPropsOpt<Value> extends true ? Opt<NonNullable<Value>> | Extract<Value, null | undefined> : Value : Value;
 type MaybeHidden<Value, Options> = Options extends {
     hidden: true;
 } ? Hidden<NonNullable<Value>> | Extract<Value, null | undefined> : Value;

package/metadata/MetadataDiscovery.js

@@ -428,13 +428,13 @@ export class MetadataDiscovery {
             prop.fieldNames = this.initManyToManyFieldName(prop, prop.name);
         }
     }
-    initManyToOneFieldName(prop, name, tableName) {
+    initManyToOneFieldName(prop, name) {
         const meta2 = prop.targetMeta;
         const ret = [];
         for (const primaryKey of meta2.primaryKeys) {
             this.initFieldName(meta2.properties[primaryKey]);
             for (const fieldName of meta2.properties[primaryKey].fieldNames) {
-                ret.push(this.#namingStrategy.joinKeyColumnName(name, fieldName, meta2.compositePK, tableName));
+                ret.push(this.#namingStrategy.joinKeyColumnName(name, fieldName, meta2.compositePK));
             }
         }
         return ret;
@@ -487,11 +487,9 @@ export class MetadataDiscovery {
             prop.joinColumns ??= prop.referencedColumnNames.map(referencedColumnName => this.#namingStrategy.joinKeyColumnName(prop.discriminator, referencedColumnName, prop.referencedColumnNames.length > 1));
         }
         else {
-            const ownerTableName = this.isExplicitTableName(meta.root) ? meta.root.tableName : undefined;
-            prop.joinColumns ??= prop.referencedColumnNames.map(referencedColumnName => this.#namingStrategy.joinKeyColumnName(meta.root.className, referencedColumnName, meta.compositePK, ownerTableName));
+            prop.joinColumns ??= prop.referencedColumnNames.map(referencedColumnName => this.#namingStrategy.joinKeyColumnName(meta.root.className, referencedColumnName, meta.compositePK));
         }
-        const inverseTableName = this.isExplicitTableName(meta2.root) ? meta2.root.tableName : undefined;
-        prop.inverseJoinColumns ??= this.initManyToOneFieldName(prop, meta2.root.className, inverseTableName);
+        prop.inverseJoinColumns ??= this.initManyToOneFieldName(prop, meta2.root.className);
     }
     isExplicitTableName(meta) {
         return meta.tableName !== this.#namingStrategy.classToTableName(meta.className);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.7-dev.13",
+  "version": "7.0.7-dev.15",
   "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.",
   "keywords": [
     "data-mapper",

package/unit-of-work/ChangeSetPersister.js

@@ -101,6 +101,8 @@ export class ChangeSetPersister {
                 !prop.generated &&
                 !prop.embedded &&
                 ![ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind) &&
+                !(prop.kind === ReferenceKind.EMBEDDED &&
+                    prop.targetMeta?.props.every(p => p.formula || p.persist === false || p.primary)) &&
                 prop.name !== wrapped.__meta.root.discriminatorColumn &&
                 prop.type !== 'ObjectId' &&
                 prop.persist !== false &&

package/utils/Utils.js

@@ -132,7 +132,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.7-dev.13';
+    static #ORM_VERSION = '7.0.7-dev.15';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */