@mikro-orm/core 6.5.7-dev.2 → 6.5.7-dev.20

package/EntityManager.d.ts

@@ -579,6 +579,7 @@ export interface MergeOptions {
     schema?: string;
     disableContextResolution?: boolean;
     keepIdentity?: boolean;
+    validate?: boolean;
 }
 export interface ForkOptions {
     /** do we want a clear identity map? defaults to true */

package/EntityManager.js

@@ -1186,8 +1186,11 @@ class EntityManager {
         }
         const em = options.disableContextResolution ? this : this.getContext();
         options.schema ??= em._schema;
+        options.validate ??= true;
         entityName = utils_1.Utils.className(entityName);
-        em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        if (options.validate) {
+            em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        }
         let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && (0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__initialized && !options.refresh) {
             return entity;
@@ -1196,11 +1199,14 @@ class EntityManager {
         const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
         const dataIsEntity = utils_1.Utils.isEntity(data);
         if (options.keepIdentity && entity && dataIsEntity && entity !== data) {
-            em.entityFactory.mergeData(meta, entity, (0, entity_1.helper)(data).__originalEntityData, { initialized: true, merge: true, ...options });
+            (0, entity_1.helper)(entity).__data = (0, entity_1.helper)(data).__data;
+            (0, entity_1.helper)(entity).__originalEntityData = (0, entity_1.helper)(data).__originalEntityData;
             return entity;
         }
         entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
-        em.validator.validate(entity, data, childMeta ?? meta);
+        if (options.validate) {
+            em.validator.validate(entity, data, childMeta ?? meta);
+        }
         em.unitOfWork.merge(entity);
         return entity;
     }

package/entity/EntityValidator.js

@@ -14,7 +14,7 @@ class EntityValidator {
     }
     validate(entity, payload, meta) {
         meta.props.forEach(prop => {
-            if (prop.inherited) {
+            if (prop.inherited || (prop.persist === false && prop.userDefined !== false)) {
                 return;
             }
             if ([enums_1.ReferenceKind.ONE_TO_MANY, enums_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {

package/hydration/ObjectHydrator.js

@@ -73,7 +73,14 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                 ret.push(`  const oldValue_${idx} = entity${entityKey};`);
             }
             ret.push(`  if (data${dataKey} === null) {`);
-            ret.push(`    entity${entityKey} = ${nullVal};`);
+            if (prop.ref) {
+                ret.push(`    entity${entityKey} = new ScalarReference();`);
+                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.set(${nullVal});`);
+            }
+            else {
+                ret.push(`    entity${entityKey} = ${nullVal};`);
+            }
             ret.push(`  } else if (typeof data${dataKey} !== 'undefined') {`);
             if (prop.customType) {
                 registerCustomType(prop, convertorKey, 'convertToJSValue', context);

package/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.HiddenProps = exports.EagerProps = exports.OptionalProps = exports.EntityRepositoryType = exports.EntityMetadata = exports.PrimaryKeyProp = void 0;
+exports.RequiredNullable = exports.DefineConfig = exports.Config = exports.Hidden = exports.Opt = exports.HiddenProps = exports.EagerProps = exports.OptionalProps = exports.EntityRepositoryType = exports.EntityMetadata = exports.PrimaryKeyProp = void 0;
 /**
  * @packageDocumentation
  * @module core
@@ -27,7 +27,11 @@ Object.defineProperty(exports, "EntityRepositoryType", { enumerable: true, get:
 Object.defineProperty(exports, "OptionalProps", { enumerable: true, get: function () { return typings_1.OptionalProps; } });
 Object.defineProperty(exports, "EagerProps", { enumerable: true, get: function () { return typings_1.EagerProps; } });
 Object.defineProperty(exports, "HiddenProps", { enumerable: true, get: function () { return typings_1.HiddenProps; } });
+Object.defineProperty(exports, "Opt", { enumerable: true, get: function () { return typings_1.Opt; } });
+Object.defineProperty(exports, "Hidden", { enumerable: true, get: function () { return typings_1.Hidden; } });
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return typings_1.Config; } });
+Object.defineProperty(exports, "DefineConfig", { enumerable: true, get: function () { return typings_1.DefineConfig; } });
+Object.defineProperty(exports, "RequiredNullable", { enumerable: true, get: function () { return typings_1.RequiredNullable; } });
 __exportStar(require("./enums"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./exceptions"), exports);

package/index.mjs

@@ -50,6 +50,7 @@ export const DeadlockException = mod.DeadlockException;
 export const DecimalType = mod.DecimalType;
 export const DefaultLogger = mod.DefaultLogger;
 export const DeferMode = mod.DeferMode;
+export const DefineConfig = mod.DefineConfig;
 export const DoubleType = mod.DoubleType;
 export const DriverException = mod.DriverException;
 export const EagerProps = mod.EagerProps;
@@ -90,6 +91,7 @@ export const ForeignKeyConstraintViolationException = mod.ForeignKeyConstraintVi
 export const Formula = mod.Formula;
 export const GeneratedCacheAdapter = mod.GeneratedCacheAdapter;
 export const GroupOperator = mod.GroupOperator;
+export const Hidden = mod.Hidden;
 export const HiddenProps = mod.HiddenProps;
 export const Hydrator = mod.Hydrator;
 export const IdentityMap = mod.IdentityMap;
@@ -132,6 +134,7 @@ export const OneToManyOptionsBuilder = mod.OneToManyOptionsBuilder;
 export const OneToManyOptionsBuilderOnlyMappedBy = mod.OneToManyOptionsBuilderOnlyMappedBy;
 export const OneToOne = mod.OneToOne;
 export const OneToOneOptionsBuilder = mod.OneToOneOptionsBuilder;
+export const Opt = mod.Opt;
 export const OptimisticLockError = mod.OptimisticLockError;
 export const OptionalProps = mod.OptionalProps;
 export const PlainObject = mod.PlainObject;
@@ -155,6 +158,7 @@ export const ReferenceKind = mod.ReferenceKind;
 export const ReferenceOptionsBuilder = mod.ReferenceOptionsBuilder;
 export const ReflectMetadataProvider = mod.ReflectMetadataProvider;
 export const RequestContext = mod.RequestContext;
+export const RequiredNullable = mod.RequiredNullable;
 export const SCALAR_TYPES = mod.SCALAR_TYPES;
 export const ScalarReference = mod.ScalarReference;
 export const SerializationContext = mod.SerializationContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.5.7-dev.2",
+  "version": "6.5.7-dev.20",
   "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",
@@ -60,11 +60,11 @@
   },
   "dependencies": {
     "dataloader": "2.2.3",
-    "dotenv": "17.2.2",
+    "dotenv": "17.2.3",
     "esprima": "4.0.1",
     "fs-extra": "11.3.2",
     "globby": "11.1.0",
-    "mikro-orm": "6.5.7-dev.2",
+    "mikro-orm": "6.5.7-dev.20",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -43,22 +43,34 @@ export declare const OptionalProps: unique symbol;
 export declare const EagerProps: unique symbol;
 export declare const HiddenProps: unique symbol;
 export declare const Config: unique symbol;
-declare const __optional: unique symbol;
-declare const __requiredNullable: unique symbol;
-declare const __hidden: unique symbol;
-declare const __config: unique symbol;
-export type Opt<T = unknown> = T & {
-    [__optional]?: 1;
-};
-export type RequiredNullable<T = never> = (T & {
-    [__requiredNullable]?: 1;
-}) | null;
-export type Hidden<T = unknown> = T & {
-    [__hidden]?: 1;
-};
-export type DefineConfig<T extends TypeConfig> = T & {
-    [__config]?: 1;
-};
+export type Opt<T = unknown> = T & Opt.Brand;
+export declare namespace Opt {
+    const __optional: unique symbol;
+    interface Brand {
+        [__optional]?: 1;
+    }
+}
+export type RequiredNullable<T = never> = (T & RequiredNullable.Brand) | null;
+export declare namespace RequiredNullable {
+    const __requiredNullable: unique symbol;
+    interface Brand {
+        [__requiredNullable]?: 1;
+    }
+}
+export type Hidden<T = unknown> = T & Hidden.Brand;
+export declare namespace Hidden {
+    const __hidden: unique symbol;
+    interface Brand {
+        [__hidden]?: 1;
+    }
+}
+export type DefineConfig<T extends TypeConfig> = T & DefineConfig.Brand;
+export declare namespace DefineConfig {
+    const __config: unique symbol;
+    interface Brand {
+        [__config]?: 1;
+    }
+}
 export type CleanTypeConfig<T> = Compute<Pick<T, Extract<keyof T, keyof TypeConfig>>>;
 export interface TypeConfig {
     forceObject?: boolean;
@@ -220,9 +232,7 @@ export type EntityDataProp<T, C extends boolean> = T extends Date ? string | Dat
     __runtime?: infer Runtime;
     __raw?: infer Raw;
 } ? (C extends true ? Raw : Runtime) : T extends Reference<infer U> ? EntityDataNested<U, C> : T extends ScalarReference<infer U> ? EntityDataProp<U, C> : T extends Collection<infer U, any> ? U | U[] | EntityDataNested<U, C> | EntityDataNested<U, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | EntityDataNested<U, C> | EntityDataNested<U, C>[] : U[] | EntityDataNested<U, C>[] : EntityDataNested<T, C>;
-export type RequiredEntityDataProp<T, O, C extends boolean> = T extends Date ? string | Date : Exclude<T, null> extends {
-    [__requiredNullable]?: 1;
-} ? T | null : T extends Scalar ? T : T extends {
+export type RequiredEntityDataProp<T, O, C extends boolean> = T extends Date ? string | Date : Exclude<T, null> extends RequiredNullable.Brand ? T | null : T extends Scalar ? T : T extends {
     __runtime?: infer Runtime;
     __raw?: infer Raw;
 } ? (C extends true ? Raw : Runtime) : T extends Reference<infer U> ? RequiredEntityDataNested<U, O, C> : T extends ScalarReference<infer U> ? RequiredEntityDataProp<U, O, C> : T extends Collection<infer U, any> ? U | U[] | RequiredEntityDataNested<U, O, C> | RequiredEntityDataNested<U, O, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | RequiredEntityDataNested<U, O, C> | RequiredEntityDataNested<U, O, C>[] : U[] | RequiredEntityDataNested<U, O, C>[] : RequiredEntityDataNested<T, O, C>;
@@ -238,9 +248,7 @@ type NullableKeys<T, V = null> = {
     [K in keyof T]: V extends T[K] ? K : never;
 }[keyof T];
 type RequiredNullableKeys<T> = {
-    [K in keyof T]: Exclude<T[K], null> extends {
-        [__requiredNullable]?: 1;
-    } ? K : never;
+    [K in keyof T]: Exclude<T[K], null> extends RequiredNullable.Brand ? K : never;
 }[keyof T];
 type ProbablyOptionalProps<T> = PrimaryProperty<T> | ExplicitlyOptionalProps<T> | Exclude<NonNullable<NullableKeys<T, null | undefined>>, RequiredNullableKeys<T>>;
 type IsOptional<T, K extends keyof T, I> = T[K] extends Collection<any, any> ? true : ExtractType<T[K]> extends I ? true : K extends ProbablyOptionalProps<T> ? true : false;

package/utils/TransactionManager.js

@@ -6,6 +6,7 @@ const events_1 = require("../events");
 const TransactionContext_1 = require("../utils/TransactionContext");
 const unit_of_work_1 = require("../unit-of-work");
 const errors_1 = require("../errors");
+const wrap_1 = require("../entity/wrap");
 /**
  * Manages transaction lifecycle and propagation for EntityManager.
  */
@@ -152,8 +153,16 @@ class TransactionManager {
      * Merges entities from fork to parent EntityManager.
      */
     mergeEntitiesToParent(fork, parent) {
+        // perf: if parent is empty, we can just move all entities from the fork to skill the `em.merge` overhead
+        if (parent.getUnitOfWork(false).getIdentityMap().keys().length === 0) {
+            for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
+                parent.getUnitOfWork(false).getIdentityMap().store(entity);
+                (0, wrap_1.helper)(entity).__em = parent;
+            }
+            return;
+        }
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
-            parent.merge(entity, { disableContextResolution: true, keepIdentity: true, refresh: true });
+            parent.merge(entity, { disableContextResolution: true, keepIdentity: true, refresh: true, validate: false });
         }
     }
     /**