@mikro-orm/sql 7.0.0-dev.120 → 7.0.0-dev.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.120",
+  "version": "7.0.0-dev.122",
   "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.",
   "type": "module",
   "exports": {
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.120"
+    "@mikro-orm/core": "7.0.0-dev.122"
   }
 }

package/plugin/transformer.d.ts

@@ -23,7 +23,7 @@ export declare class MikroTransformer extends OperationNodeTransformer {
      * Global map of all entities involved in the query.
      * Populated during AST transformation and used for result transformation.
      */
-    protected readonly entityMap: Map<string, EntityMetadata<any>>;
+    protected readonly entityMap: Map<string, EntityMetadata<any, import("@mikro-orm/core").EntityCtor<any>>>;
     constructor(em: SqlEntityManager, options?: MikroKyselyPluginOptions);
     reset(): void;
     getOutputEntityMap(): Map<string, EntityMetadata>;

package/query/CriteriaNode.d.ts

@@ -21,7 +21,10 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
     renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
-    getPath(addIndex?: boolean): string;
+    getPath(opts?: {
+        addIndex?: boolean;
+        parentPath?: string;
+    }): string;
     private isPivotJoin;
     getPivotPath(path: string): string;
     aliased(field: string, alias?: string): string;

package/query/CriteriaNode.js

@@ -76,11 +76,11 @@ export class CriteriaNode {
         }
         return Utils.getPrimaryKeyHash(this.prop.referencedColumnNames.map(col => `${alias}.${col}`));
     }
-    getPath(addIndex = false) {
+    getPath(opts) {
         // use index on parent only if we are processing to-many relation
         const addParentIndex = this.prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(this.prop.kind);
-        const parentPath = this.parent?.getPath(addParentIndex) ?? Utils.className(this.entityName);
-        const index = addIndex && this.index != null ? `[${this.index}]` : '';
+        const parentPath = opts?.parentPath ?? this.parent?.getPath({ addIndex: addParentIndex }) ?? Utils.className(this.entityName);
+        const index = opts?.addIndex && this.index != null ? `[${this.index}]` : '';
         // ignore group operators to allow easier mapping (e.g. for orderBy)
         const key = this.key && !RawQueryFragment.isKnownFragmentSymbol(this.key) && !['$and', '$or', '$not'].includes(this.key) ? '.' + this.key : '';
         const ret = parentPath + index + key;

package/query/ObjectCriteriaNode.js

@@ -7,7 +7,7 @@ import { JoinType, QueryType } from './enums.js';
 export class ObjectCriteriaNode extends CriteriaNode {
     process(qb, options) {
         const matchPopulateJoins = options?.matchPopulateJoins || (this.prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind));
-        const nestedAlias = qb.getAliasForJoinPath(this.getPath(), { ...options, matchPopulateJoins });
+        const nestedAlias = qb.getAliasForJoinPath(this.getPath(options), { ...options, matchPopulateJoins });
         const ownerAlias = options?.alias || qb.alias;
         const keys = Utils.getObjectQueryKeys(this.payload);
         let alias = options?.alias;
@@ -117,7 +117,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
         }, {});
     }
     willAutoJoin(qb, alias, options) {
-        const nestedAlias = qb.getAliasForJoinPath(this.getPath(), options);
+        const nestedAlias = qb.getAliasForJoinPath(this.getPath(options), options);
         const ownerAlias = alias || qb.alias;
         const keys = Utils.getObjectQueryKeys(this.payload);
         if (nestedAlias) {

package/query/QueryBuilder.js

@@ -274,7 +274,9 @@ export class QueryBuilder {
                 continue;
             }
             filterOptions = QueryHelper.mergePropertyFilters(join.prop.filters, filterOptions);
-            const cond = await em.applyFilters(join.prop.targetMeta.class, join.cond, filterOptions, 'read');
+            let cond = await em.applyFilters(join.prop.targetMeta.class, join.cond, filterOptions, 'read');
+            const criteriaNode = CriteriaNodeFactory.createNode(this.metadata, join.prop.targetMeta.class, cond);
+            cond = criteriaNode.process(this, { matchPopulateJoins: true, filter: true, alias: join.alias, ignoreBranching: true, parentPath: join.path });
             if (Utils.hasObjectKeys(cond) || RawQueryFragment.hasObjectFragments(cond)) {
                 // remove nested filters, we only care about scalars here, nesting would require another join branch
                 for (const key of Object.keys(cond)) {

package/query/QueryBuilderHelper.js

@@ -449,6 +449,9 @@ export class QueryBuilderHelper {
         }
         const [a, f] = rawField ? [] : this.splitField(key);
         const prop = f && this.getProperty(f, a);
+        if (prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
+            return { sql: '', params };
+        }
         if (op === '$fulltext') {
             /* v8 ignore next */
             if (!prop) {

package/query/ScalarCriteriaNode.js

@@ -8,7 +8,7 @@ import { QueryBuilder } from './QueryBuilder.js';
 export class ScalarCriteriaNode extends CriteriaNode {
     process(qb, options) {
         const matchPopulateJoins = options?.matchPopulateJoins || (this.prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind));
-        const nestedAlias = qb.getAliasForJoinPath(this.getPath(), { ...options, matchPopulateJoins });
+        const nestedAlias = qb.getAliasForJoinPath(this.getPath(options), { ...options, matchPopulateJoins });
         if (this.shouldJoin(qb, nestedAlias)) {
             const path = this.getPath();
             const parentPath = this.parent.getPath(); // the parent is always there, otherwise `shouldJoin` would return `false`