@mikro-orm/core 6.4.17-dev.65 → 6.4.17-dev.66

package/EntityManager.js

@@ -12,6 +12,7 @@ const unit_of_work_1 = require("./unit-of-work");
 const enums_1 = require("./enums");
 const events_1 = require("./events");
 const errors_1 = require("./errors");
+const utils_2 = require("./entity/utils");
 /**
  * The EntityManager is the central access point to ORM functionality. It is a facade to all different ORM subsystems
  * such as UnitOfWork, Query Language, and Repository API.
@@ -131,7 +132,6 @@ class EntityManager {
             await em.entityLoader.populate(entityName, cached.data, populate, {
                 ...options,
                 ...em.getPopulateWhere(where, options),
-                convertCustomTypes: false,
                 ignoreLazyScalarProperties: true,
                 lookup: false,
             });
@@ -162,7 +162,6 @@ class EntityManager {
         await em.entityLoader.populate(entityName, unique, populate, {
             ...options,
             ...em.getPopulateWhere(where, options),
-            convertCustomTypes: false,
             ignoreLazyScalarProperties: true,
             lookup: false,
         });
@@ -283,7 +282,8 @@ class EntityManager {
             for (const hint of options.populate) {
                 const field = hint.field.split(':')[0];
                 const prop = meta.properties[field];
-                const joined = (prop.strategy || options.strategy || hint.strategy || this.config.get('loadStrategy')) === enums_1.LoadStrategy.JOINED && prop.kind !== enums_1.ReferenceKind.SCALAR;
+                const strategy = (0, utils_2.getLoadingStrategy)(prop.strategy || options.strategy || hint.strategy || this.config.get('loadStrategy'), prop.kind);
+                const joined = strategy === enums_1.LoadStrategy.JOINED && prop.kind !== enums_1.ReferenceKind.SCALAR;
                 if (!joined && !hint.filter) {
                     continue;
                 }
@@ -493,7 +493,7 @@ class EntityManager {
             for (const e of fork.unitOfWork.getIdentityMap()) {
                 const ref = em.getReference(e.constructor.name, (0, entity_1.helper)(e).getPrimaryKey());
                 const data = this.comparator.prepareEntity(e);
-                em.config.getHydrator(this.metadata).hydrate(ref, (0, entity_1.helper)(ref).__meta, (0, entity_1.helper)(e).toPOJO(), em.entityFactory, 'full', false, true);
+                em.config.getHydrator(this.metadata).hydrate(ref, (0, entity_1.helper)(ref).__meta, (0, entity_1.helper)(e).serialize({ ignoreSerializers: true }), em.entityFactory, 'full', false, true);
                 (0, entity_1.helper)(ref).__originalEntityData = data;
             }
         }
@@ -541,7 +541,6 @@ class EntityManager {
                 await em.entityLoader.populate(entityName, [cached.data], options.populate, {
                     ...options,
                     ...em.getPopulateWhere(where, options),
-                    convertCustomTypes: false,
                     ignoreLazyScalarProperties: true,
                     lookup: false,
                 });
@@ -1555,7 +1554,6 @@ class EntityManager {
             ...options,
             ...this.getPopulateWhere(where, options),
             orderBy: options.populateOrderBy ?? options.orderBy,
-            convertCustomTypes: false,
             ignoreLazyScalarProperties: true,
             lookup: false,
         });

package/entity/EntityLoader.js

@@ -143,12 +143,16 @@ class EntityLoader {
         const innerOrderBy = Utils_1.Utils.asArray(options.orderBy)
             .filter(orderBy => (Array.isArray(orderBy[prop.name]) && orderBy[prop.name].length > 0) || Utils_1.Utils.isObject(orderBy[prop.name]))
             .flatMap(orderBy => orderBy[prop.name]);
+        const where = await this.extractChildCondition(options, prop);
         if (prop.kind === enums_1.ReferenceKind.MANY_TO_MANY && this.driver.getPlatform().usesPivotTable()) {
             const res = await this.findChildrenFromPivotTable(filtered, prop, options, innerOrderBy, populate, !!ref);
             return Utils_1.Utils.flatten(res);
         }
-        const where = await this.extractChildCondition(options, prop);
-        const { items, partial } = await this.findChildren(entities, prop, populate, { ...options, where, orderBy: innerOrderBy }, !!(ref || prop.mapToPk));
+        const { items, partial } = await this.findChildren(options.filtered ?? entities, prop, populate, {
+            ...options,
+            where,
+            orderBy: innerOrderBy,
+        }, !!(ref || prop.mapToPk));
         this.initializeCollections(filtered, prop, field, items, innerOrderBy.length > 0, partial);
         return items;
     }
@@ -213,7 +217,7 @@ class EntityLoader {
         const meta = prop.targetMeta;
         let fk = Utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
         let schema = options.schema;
-        let partial = !Utils_1.Utils.isEmpty(prop.where);
+        const partial = !Utils_1.Utils.isEmpty(prop.where) || !Utils_1.Utils.isEmpty(options.where);
         if (prop.kind === enums_1.ReferenceKind.ONE_TO_MANY || (prop.kind === enums_1.ReferenceKind.MANY_TO_MANY && !prop.owner)) {
             fk = meta.properties[prop.mappedBy].name;
         }
@@ -254,7 +258,6 @@ class EntityLoader {
                 }
             }
         }
-        partial = !Utils_1.Utils.isEmpty(where);
         const items = await this.em.find(prop.type, where, {
             filters, convertCustomTypes, lockMode, populateWhere, logging,
             orderBy: [...Utils_1.Utils.asArray(options.orderBy), ...propOrderBy],
@@ -322,11 +325,12 @@ class EntityLoader {
         for (const entity of entities) {
             visited.delete(entity);
         }
-        const filtered = Utils_1.Utils.unique(children.filter(e => !visited.has(e)));
+        const unique = Utils_1.Utils.unique(children);
+        const filtered = unique.filter(e => !visited.has(e));
         for (const entity of entities) {
             visited.add(entity);
         }
-        await this.populate(prop.type, filtered, populate.children ?? populate.all, {
+        await this.populate(prop.type, unique, populate.children ?? populate.all, {
             where: await this.extractChildCondition(options, prop, false),
             orderBy: innerOrderBy,
             fields,
@@ -343,6 +347,8 @@ class EntityLoader {
             refresh: refresh && !filtered.every(item => options.visited.has(item)),
             // @ts-ignore not a public option, will be propagated to the populate call
             visited: options.visited,
+            // @ts-ignore not a public option
+            filtered,
         });
     }
     /** @internal */

package/entity/index.d.ts

@@ -12,3 +12,4 @@ export * from './BaseEntity';
 export * from './WrappedEntity';
 export * from './wrap';
 export * from './defineEntity';
+export * from './utils';

package/entity/index.js

@@ -28,3 +28,4 @@ __exportStar(require("./BaseEntity"), exports);
 __exportStar(require("./WrappedEntity"), exports);
 __exportStar(require("./wrap"), exports);
 __exportStar(require("./defineEntity"), exports);
+__exportStar(require("./utils"), exports);

package/entity/utils.d.ts

@@ -1,5 +1,12 @@
 import type { EntityMetadata, PopulateOptions } from '../typings';
+import { LoadStrategy, ReferenceKind } from '../enums';
 /**
  * @internal
  */
 export declare function expandDotPaths<Entity>(meta: EntityMetadata<Entity>, populate?: readonly (string | PopulateOptions<Entity>)[], normalized?: boolean): PopulateOptions<Entity>[];
+/**
+ * Returns the loading strategy based on the provided hint.
+ * If `BALANCED` strategy is used, it will return JOINED if the property is a to-one relation.
+ * @internal
+ */
+export declare function getLoadingStrategy(strategy: LoadStrategy | `${LoadStrategy}`, kind: ReferenceKind): LoadStrategy.SELECT_IN | LoadStrategy.JOINED;

package/entity/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandDotPaths = expandDotPaths;
+exports.getLoadingStrategy = getLoadingStrategy;
 const enums_1 = require("../enums");
-const core_1 = require("@mikro-orm/core");
+const Utils_1 = require("../utils/Utils");
 /**
  * Expands `books.perex` like populate to use `children` array instead of the dot syntax
  */
@@ -20,7 +21,7 @@ function expandNestedPopulate(parentProp, parts, strategy, all) {
  * @internal
  */
 function expandDotPaths(meta, populate, normalized = false) {
-    const ret = normalized ? populate : core_1.Utils.asArray(populate).map(field => {
+    const ret = normalized ? populate : Utils_1.Utils.asArray(populate).map(field => {
         if (typeof field === 'string') {
             return { field };
         }
@@ -58,3 +59,16 @@ function expandDotPaths(meta, populate, normalized = false) {
     }
     return ret;
 }
+/**
+ * Returns the loading strategy based on the provided hint.
+ * If `BALANCED` strategy is used, it will return JOINED if the property is a to-one relation.
+ * @internal
+ */
+function getLoadingStrategy(strategy, kind) {
+    if (strategy === enums_1.LoadStrategy.BALANCED) {
+        return [enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(kind)
+            ? enums_1.LoadStrategy.JOINED
+            : enums_1.LoadStrategy.SELECT_IN;
+    }
+    return strategy;
+}

package/enums.d.ts

@@ -108,7 +108,9 @@ export declare enum Cascade {
 }
 export declare enum LoadStrategy {
     SELECT_IN = "select-in",
-    JOINED = "joined"
+    JOINED = "joined",
+    INNER_JOINED = "inner-joined",
+    BALANCED = "balanced"
 }
 export declare enum DataloaderType {
     NONE = 0,

package/enums.js

@@ -125,6 +125,8 @@ var LoadStrategy;
 (function (LoadStrategy) {
     LoadStrategy["SELECT_IN"] = "select-in";
     LoadStrategy["JOINED"] = "joined";
+    LoadStrategy["INNER_JOINED"] = "inner-joined";
+    LoadStrategy["BALANCED"] = "balanced";
 })(LoadStrategy || (exports.LoadStrategy = LoadStrategy = {}));
 var DataloaderType;
 (function (DataloaderType) {

package/index.mjs

@@ -184,6 +184,8 @@ export const createSqlFunction = mod.createSqlFunction;
 export const defineConfig = mod.defineConfig;
 export const defineEntity = mod.defineEntity;
 export const equals = mod.equals;
+export const expandDotPaths = mod.expandDotPaths;
+export const getLoadingStrategy = mod.getLoadingStrategy;
 export const getOnConflictFields = mod.getOnConflictFields;
 export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
 export const helper = mod.helper;

package/metadata/MetadataDiscovery.js

@@ -622,7 +622,7 @@ class MetadataDiscovery {
         }
         data.properties[meta.name + '_owner'] = this.definePivotProperty(prop, meta.name + '_owner', meta.className, targetType + '_inverse', true, meta.className === targetType);
         data.properties[targetType + '_inverse'] = this.definePivotProperty(prop, targetType + '_inverse', targetType, meta.name + '_owner', false, meta.className === targetType);
-        return this.metadata.set(data.className, data);
+        return this.metadata.set(data.className, EntitySchema_1.EntitySchema.fromMetadata(data).init().meta);
     }
     defineFixedOrderProperty(prop, targetType) {
         const pk = prop.fixedOrderColumn || this.namingStrategy.referenceColumnName();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.17-dev.65",
+  "version": "6.4.17-dev.66",
   "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.17-dev.65",
+    "mikro-orm": "6.4.17-dev.66",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -698,6 +698,7 @@ export type PopulateOptions<T> = {
     strategy?: LoadStrategy;
     all?: boolean;
     filter?: boolean;
+    joinType?: 'inner join' | 'left join';
     children?: PopulateOptions<T[keyof T]>[];
 };
 type Loadable<T extends object> = Collection<T, any> | Reference<T> | Ref<T> | readonly T[];

package/utils/Configuration.d.ts

@@ -359,7 +359,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     useBatchUpdates?: boolean;
     batchSize: number;
     hydrator: HydratorConstructor;
-    loadStrategy: LoadStrategy | 'select-in' | 'joined';
+    loadStrategy: LoadStrategy | `${LoadStrategy}`;
     dataloader: DataloaderType | boolean;
     populateWhere?: PopulateHint | `${PopulateHint}`;
     flushMode: FlushMode | 'commit' | 'auto' | 'always';