@mikro-orm/core 7.3.0-dev.4 → 7.3.0-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.3.0-dev.4",
+  "version": "7.3.0-dev.5",
   "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/utils/QueryHelper.d.ts

@@ -46,6 +46,8 @@ export declare class QueryHelper {
     static processWhere<T extends object>(options: ProcessWhereOptions<T>): FilterQuery<T>;
     /** @internal Splits a polymorphic target key like `imageable[Article]` into the property and target class names. */
     static splitPolymorphicKey(key: string): [string, string?];
+    /** @internal Resolves the targets of a polymorphic target key like `imageable[Article]` or `imageable[Product,Article]`. */
+    static findTargetMetas(prop: EntityProperty | null | undefined, key: string): EntityMetadata[];
     /** @internal Resolves the target entity of a condition key, including polymorphic target keys like `imageable[Article]`. */
     static findTargetMeta(prop: EntityProperty | null | undefined, key: string): EntityMetadata | undefined;
     /**
@@ -54,6 +56,12 @@ export declare class QueryHelper {
      * when more targets match. The first target alone keeps the regular relation join.
      */
     private static splitPolymorphicConditions;
+    /**
+     * Routes ordering by properties of polymorphic to-one relations to the targets that define them, e.g.
+     * `{ imageable: { name: 'asc' } }` becomes `{ 'imageable[Product,Article]': { name: 'asc' } }`, ordered by
+     * the first non-null value. Nested relations and formulas are ordered via the first target defining them.
+     */
+    private static splitPolymorphicOrderBy;
     /** Property names used in a condition, including those nested in group operators. */
     private static collectConditionKeys;
     static getActiveFilters<T>(meta: EntityMetadata<T>, options: FilterOptions | undefined, filters: Dictionary<FilterDef>): FilterDef[];

package/utils/QueryHelper.js

@@ -262,8 +262,10 @@ export class QueryHelper {
         if (!Utils.isPlainObject(where)) {
             return where;
         }
-        if (meta && options.type !== 'orderBy') {
-            where = QueryHelper.splitPolymorphicConditions(meta, where);
+        if (meta) {
+            where = (options.type === 'orderBy'
+                ? QueryHelper.splitPolymorphicOrderBy(meta, where)
+                : QueryHelper.splitPolymorphicConditions(meta, where));
         }
         return Utils.getObjectQueryKeys(where).reduce((o, key) => {
             let value = where[key];
@@ -328,13 +330,18 @@ export class QueryHelper {
     }
     /** @internal Splits a polymorphic target key like `imageable[Article]` into the property and target class names. */
     static splitPolymorphicKey(key) {
-        const match = /^(\w+)\[(\w+)]$/.exec(key);
+        const match = /^(\w+)\[([\w,]+)]$/.exec(key);
         return match ? [match[1], match[2]] : [key];
     }
+    /** @internal Resolves the targets of a polymorphic target key like `imageable[Article]` or `imageable[Product,Article]`. */
+    static findTargetMetas(prop, key) {
+        const [, targetNames] = QueryHelper.splitPolymorphicKey(key);
+        const targets = targetNames?.split(',').map(name => prop?.polymorphTargets?.find(t => t.className === name));
+        return targets?.every(Boolean) ? targets : [];
+    }
     /** @internal Resolves the target entity of a condition key, including polymorphic target keys like `imageable[Article]`. */
     static findTargetMeta(prop, key) {
-        const [, targetName] = QueryHelper.splitPolymorphicKey(key);
-        return targetName ? prop?.polymorphTargets?.find(t => t.className === targetName) : prop?.targetMeta;
+        return QueryHelper.splitPolymorphicKey(key)[1] ? QueryHelper.findTargetMetas(prop, key)[0] : prop?.targetMeta;
     }
     /**
      * Routes conditions on polymorphic to-one relations to the targets that define all the queried properties,
@@ -373,6 +380,34 @@ export class QueryHelper {
         }
         return ret;
     }
+    /**
+     * Routes ordering by properties of polymorphic to-one relations to the targets that define them, e.g.
+     * `{ imageable: { name: 'asc' } }` becomes `{ 'imageable[Product,Article]': { name: 'asc' } }`, ordered by
+     * the first non-null value. Nested relations and formulas are ordered via the first target defining them.
+     */
+    static splitPolymorphicOrderBy(meta, orderBy) {
+        const ret = {};
+        for (const key of Utils.getObjectQueryKeys(orderBy)) {
+            const prop = meta.properties[key];
+            const value = orderBy[key];
+            if (!prop?.polymorphTargets ||
+                ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) ||
+                !Utils.isPlainObject(value)) {
+                ret[key] = value;
+                continue;
+            }
+            for (const field of Utils.getObjectQueryKeys(value)) {
+                const found = prop.polymorphTargets.filter(target => field in target.properties);
+                const sharedPK = found.length === prop.polymorphTargets.length && found.every(target => target.primaryKeys.includes(field));
+                const single = Utils.isPlainObject(value[field]) || found.some(target => target.properties[field].formula);
+                const targets = found.length === 0 ? [prop.targetMeta] : single ? [found[0]] : found;
+                // shared PKs are ordered by the FK column without a join
+                const targetKey = sharedPK ? key : `${key}[${targets.map(target => target.className).join(',')}]`;
+                ret[targetKey] = { ...ret[targetKey], [field]: value[field] };
+            }
+        }
+        return ret;
+    }
     /** Property names used in a condition, including those nested in group operators. */
     static collectConditionKeys(payload) {
         return Object.keys(payload).flatMap(k => {

package/utils/Utils.js

@@ -153,7 +153,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.3.0-dev.4';
+    static #ORM_VERSION = '7.3.0-dev.5';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;