@mikro-orm/core 6.4.4-dev.9 → 6.4.5-dev.0

package/EntityManager.js

@@ -607,6 +607,13 @@ class EntityManager {
      * If the entity is already present in current context, there won't be any queries - instead, the entity data will be assigned and an explicit `flush` will be required for those changes to be persisted.
      */
     async upsert(entityNameOrEntity, data, options = {}) {
+        if (options.disableIdentityMap ?? this.config.get('disableIdentityMap')) {
+            const em = this.getContext(false);
+            const fork = em.fork({ keepTransactionContext: true });
+            const ret = await fork.upsert(entityNameOrEntity, data, { ...options, disableIdentityMap: false });
+            fork.clear();
+            return ret;
+        }
         const em = this.getContext(false);
         em.prepareOptions(options);
         let entityName;
@@ -731,6 +738,13 @@ class EntityManager {
      * If the entity is already present in current context, there won't be any queries - instead, the entity data will be assigned and an explicit `flush` will be required for those changes to be persisted.
      */
     async upsertMany(entityNameOrEntity, data, options = {}) {
+        if (options.disableIdentityMap ?? this.config.get('disableIdentityMap')) {
+            const em = this.getContext(false);
+            const fork = em.fork({ keepTransactionContext: true });
+            const ret = await fork.upsertMany(entityNameOrEntity, data, { ...options, disableIdentityMap: false });
+            fork.clear();
+            return ret;
+        }
         const em = this.getContext(false);
         em.prepareOptions(options);
         let entityName;
@@ -1184,7 +1198,7 @@ class EntityManager {
             merge: options.managed,
         });
         options.persist ??= em.config.get('persistOnCreate');
-        if (options.persist) {
+        if (options.persist && !this.getMetadata(entityName).embeddable) {
             em.persist(entity);
         }
         return entity;
@@ -1558,6 +1572,10 @@ class EntityManager {
                         continue;
                     }
                     const prop = meta.properties[key];
+                    if (!prop.targetMeta) {
+                        ret.push(key);
+                        continue;
+                    }
                     const inner = pruneToOneRelations(prop.targetMeta, [parts.join('.')]);
                     if (inner.length > 0) {
                         ret.push(...inner.map(c => `${key}.${c}`));

package/drivers/IDatabaseDriver.d.ts

@@ -171,6 +171,7 @@ export interface UpsertOptions<Entity, Fields extends string = never> extends Om
     onConflictAction?: 'ignore' | 'merge';
     onConflictMergeFields?: AutoPath<Entity, Fields, `${PopulatePath.ALL}`>[];
     onConflictExcludeFields?: AutoPath<Entity, Fields, `${PopulatePath.ALL}`>[];
+    disableIdentityMap?: boolean;
 }
 export interface UpsertManyOptions<Entity, Fields extends string = never> extends UpsertOptions<Entity, Fields> {
     batchSize?: number;

package/entity/EntityAssigner.d.ts

@@ -40,6 +40,10 @@ export interface AssignOptions<Convert extends boolean> {
      * to foreign keys. Defaults to `false`.
      */
     onlyOwnProperties?: boolean;
+    /**
+     * With `ignoreUndefined` enabled, `undefined` properties passed in the payload are skipped. Defaults to `false`.
+     */
+    ignoreUndefined?: boolean;
     /**
      * `assign` excepts runtime values for properties using custom types. To be able to assign raw database values, you
      * can enable the `convertCustomTypes` option. Defaults to `false`.

package/entity/EntityAssigner.js

@@ -37,10 +37,12 @@ class EntityAssigner {
         return entity;
     }
     static assignProperty(entity, propName, props, data, options) {
-        if (options.onlyProperties && !(propName in props)) {
+        let value = data[propName];
+        const onlyProperties = options.onlyProperties && !(propName in props);
+        const ignoreUndefined = options.ignoreUndefined === true && value === undefined;
+        if (onlyProperties || ignoreUndefined) {
             return;
         }
-        let value = data[propName];
         const prop = { ...props[propName], name: propName };
         if (prop && options.onlyOwnProperties) {
             if ([enums_1.ReferenceKind.MANY_TO_MANY, enums_1.ReferenceKind.ONE_TO_MANY].includes(prop.kind)) {

package/entity/EntityValidator.js

@@ -5,6 +5,7 @@ const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
 const errors_1 = require("../errors");
 const wrap_1 = require("./wrap");
+const RawQueryFragment_1 = require("../utils/RawQueryFragment");
 class EntityValidator {
     strict;
     KNOWN_TYPES = new Set(['string', 'number', 'boolean', 'bigint', 'Uint8Array', 'Date', 'Buffer', 'RegExp']);
@@ -54,10 +55,11 @@ class EntityValidator {
         }
     }
     validateProperty(prop, givenValue, entity) {
-        if (givenValue === null || givenValue === undefined) {
+        if (givenValue == null || givenValue instanceof RawQueryFragment_1.RawQueryFragment) {
             return givenValue;
         }
         const expectedType = prop.runtimeType;
+        const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
         let givenType = Utils_1.Utils.getObjectType(givenValue);
         let ret = givenValue;
         if (!this.strict) {
@@ -66,12 +68,12 @@ class EntityValidator {
         }
         if (prop.enum && prop.items) {
             if (!prop.items.some(it => it === givenValue)) {
-                throw errors_1.ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
+                throw errors_1.ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
             }
         }
         else {
             if (givenType !== expectedType && this.KNOWN_TYPES.has(expectedType)) {
-                throw errors_1.ValidationError.fromWrongPropertyType(entity, prop.name, expectedType, givenType, givenValue);
+                throw errors_1.ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
             }
         }
         return ret;

package/metadata/MetadataDiscovery.js

@@ -826,10 +826,11 @@ class MetadataDiscovery {
         const parentProperty = meta.properties[embeddedProp.embedded?.[0] ?? ''];
         const object = isParentObject(embeddedProp);
         this.initFieldName(embeddedProp, rootProperty !== embeddedProp && object);
-        // the prefix of the parent can not be a boolean; it already passed here
+        // the prefix of the parent cannot be a boolean; it already passed here
         const prefix = this.getPrefix(embeddedProp, parentProperty);
+        const glue = object ? '~' : '_';
         for (const prop of Object.values(embeddable.properties)) {
-            const name = (embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_') + prop.name;
+            const name = (embeddedProp.embeddedPath?.join(glue) ?? embeddedProp.fieldNames[0] + glue) + prop.name;
             meta.properties[name] = Utils_1.Utils.copy(prop, false);
             meta.properties[name].name = name;
             meta.properties[name].embedded = [embeddedProp.name, prop.name];
@@ -1245,7 +1246,8 @@ class MetadataDiscovery {
         if (prop.customType) {
             return prop.customType;
         }
-        let t = prop.columnTypes?.[0] ?? prop.type;
+        /* istanbul ignore next */
+        let t = prop.columnTypes?.[0] ?? prop.type ?? '';
         if (prop.nativeEnumName) {
             t = 'enum';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.4-dev.9",
+  "version": "6.4.5-dev.0",
   "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.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.4-dev.9",
+    "mikro-orm": "6.4.5-dev.0",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/Configuration.d.ts

@@ -71,6 +71,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             updateByPrimaryKey: true;
             mergeObjectProperties: false;
             mergeEmbeddedProperties: true;
+            ignoreUndefined: false;
         };
         persistOnCreate: true;
         upsertManaged: true;

package/utils/Configuration.js

@@ -65,6 +65,7 @@ class Configuration {
             updateByPrimaryKey: true,
             mergeObjectProperties: false,
             mergeEmbeddedProperties: true,
+            ignoreUndefined: false,
         },
         persistOnCreate: true,
         upsertManaged: true,

package/utils/EntityComparator.js

@@ -389,8 +389,8 @@ class EntityComparator {
         dataKey = dataKey.replace(/^\./, '');
         const contains = (str, re) => (str.match(re) || []).length > 0;
         const a = contains(dataKey, /\./g);
-        const b = contains(dataKey, /\[/g);
-        return !!prop.object && !(a || b);
+        const b = contains(dataKey, /\[idx_/g);
+        return !!prop.object && !a && !b;
     }
     getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object = prop.object) {
         const padding = ' '.repeat(level * 2);