nestjs-query-mikro-orm 0.0.9 → 0.1.1

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { EntityName, AnyEntity, FilterQuery, EntityMetadata, EntityRepository } from '@mikro-orm/core';
 import { DynamicModule, FactoryProvider } from '@nestjs/common';
-import { Filter, Query, SortField, FilterComparisonOperators, CommonFieldComparisonBetweenType, AggregateQuery, AggregateResponse, Class, GetByIdOptions, FindRelationOptions, ModifyRelationOptions, QueryService, DeepPartial, FindByIdOptions, UpdateOneOptions, UpdateManyResponse, DeleteOneOptions, DeleteManyResponse, Filterable } from '@nestjs-query/core';
+import { Filter, Query, SortField, FilterComparisonOperators, CommonFieldComparisonBetweenType, AggregateQuery, AggregateResponse, Class, GetByIdOptions, FindRelationOptions, ModifyRelationOptions, QueryService, DeepPartial, FindByIdOptions, UpdateOneOptions, UpdateManyResponse, DeleteOneOptions, DeleteManyResponse, Filterable } from '@ptc-org/nestjs-query-core';
 
 declare class NestjsQueryMikroOrmModule {
     static forFeature(entities: EntityName<AnyEntity>[], contextName?: string): DynamicModule;
@@ -342,6 +342,7 @@ declare abstract class RelationQueryService<Entity extends object> {
      * @param query - A query to filter, page or sort relations.
      */
     private batchFindRelations;
+    private isRelationClassIdentity;
     private getRelationMeta;
     private getRelationEntity;
     private getRelations;
@@ -375,7 +376,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
     constructor(repo: EntityRepository<Entity>, opts?: MikroOrmQueryServiceOpts<Entity>);
     get EntityClass(): Class<Entity>;
     /**
-     * Query for multiple entities, using a Query from `@nestjs-query/core`.
+     * Query for multiple entities, using a Query from `@ptc-org/nestjs-query-core`.
      *
      * @example
      * ```ts
@@ -450,7 +451,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     updateOne(id: number | string, update: DeepPartial<Entity>, opts?: UpdateOneOptions<Entity>): Promise<Entity>;
     /**
-     * Update multiple entities with a `@nestjs-query/core` Filter.
+     * Update multiple entities with a `@ptc-org/nestjs-query-core` Filter.
      *
      * @example
      * ```ts
@@ -477,7 +478,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     deleteOne(id: string | number, opts?: DeleteOneOptions<Entity>): Promise<Entity>;
     /**
-     * Delete multiple records with a `@nestjs-query/core` `Filter`.
+     * Delete multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
      *
      * @example
      *
@@ -504,7 +505,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     restoreOne(id: string | number, opts?: Filterable<Entity>): Promise<Entity>;
     /**
-     * Restores multiple records with a `@nestjs-query/core` `Filter`.
+     * Restores multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
      *
      * @example
      *

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { EntityName, AnyEntity, FilterQuery, EntityMetadata, EntityRepository } from '@mikro-orm/core';
 import { DynamicModule, FactoryProvider } from '@nestjs/common';
-import { Filter, Query, SortField, FilterComparisonOperators, CommonFieldComparisonBetweenType, AggregateQuery, AggregateResponse, Class, GetByIdOptions, FindRelationOptions, ModifyRelationOptions, QueryService, DeepPartial, FindByIdOptions, UpdateOneOptions, UpdateManyResponse, DeleteOneOptions, DeleteManyResponse, Filterable } from '@nestjs-query/core';
+import { Filter, Query, SortField, FilterComparisonOperators, CommonFieldComparisonBetweenType, AggregateQuery, AggregateResponse, Class, GetByIdOptions, FindRelationOptions, ModifyRelationOptions, QueryService, DeepPartial, FindByIdOptions, UpdateOneOptions, UpdateManyResponse, DeleteOneOptions, DeleteManyResponse, Filterable } from '@ptc-org/nestjs-query-core';
 
 declare class NestjsQueryMikroOrmModule {
     static forFeature(entities: EntityName<AnyEntity>[], contextName?: string): DynamicModule;
@@ -342,6 +342,7 @@ declare abstract class RelationQueryService<Entity extends object> {
      * @param query - A query to filter, page or sort relations.
      */
     private batchFindRelations;
+    private isRelationClassIdentity;
     private getRelationMeta;
     private getRelationEntity;
     private getRelations;
@@ -375,7 +376,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
     constructor(repo: EntityRepository<Entity>, opts?: MikroOrmQueryServiceOpts<Entity>);
     get EntityClass(): Class<Entity>;
     /**
-     * Query for multiple entities, using a Query from `@nestjs-query/core`.
+     * Query for multiple entities, using a Query from `@ptc-org/nestjs-query-core`.
      *
      * @example
      * ```ts
@@ -450,7 +451,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     updateOne(id: number | string, update: DeepPartial<Entity>, opts?: UpdateOneOptions<Entity>): Promise<Entity>;
     /**
-     * Update multiple entities with a `@nestjs-query/core` Filter.
+     * Update multiple entities with a `@ptc-org/nestjs-query-core` Filter.
      *
      * @example
      * ```ts
@@ -477,7 +478,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     deleteOne(id: string | number, opts?: DeleteOneOptions<Entity>): Promise<Entity>;
     /**
-     * Delete multiple records with a `@nestjs-query/core` `Filter`.
+     * Delete multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
      *
      * @example
      *
@@ -504,7 +505,7 @@ declare class MikroOrmQueryService<Entity extends object> extends RelationQueryS
      */
     restoreOne(id: string | number, opts?: Filterable<Entity>): Promise<Entity>;
     /**
-     * Restores multiple records with a `@nestjs-query/core` `Filter`.
+     * Restores multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
      *
      * @example
      *

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { MikroOrmModule, getRepositoryToken } from '@mikro-orm/nestjs';
-import { getFilterFields, AssemblerFactory, AssemblerSerializer, AssemblerDeserializer, getQueryServiceToken } from '@nestjs-query/core';
+import { getFilterFields, AssemblerFactory, AssemblerSerializer, AssemblerDeserializer, getQueryServiceToken } from '@ptc-org/nestjs-query-core';
 import { raw, wrap } from '@mikro-orm/core';
-import { getAssemblerSerializer } from '@nestjs-query/core/dist/src/assemblers/assembler.serializer';
+import { getAssemblerSerializer } from '@ptc-org/nestjs-query-core/src/assemblers/assembler.serializer';
 import { BadRequestException, NotFoundException, MethodNotAllowedException } from '@nestjs/common';
 import { instanceToPlain } from 'class-transformer';
 import merge from 'lodash.merge';
@@ -834,7 +834,14 @@ var RelationQueryBuilder = class {
         const entityKeys = Object.keys(entityAsRecord);
         const matchingKey = entityKeys.find((key) => {
           const keyLower = key.toLowerCase();
-          return keyLower.endsWith("id") && relationNameLower.includes(keyLower.replace(/id$/, ""));
+          if (keyLower === "id" || !keyLower.endsWith("id")) {
+            return false;
+          }
+          const base = keyLower.replace(/id$/, "");
+          if (!base) {
+            return false;
+          }
+          return relationNameLower.includes(base);
         });
         if (matchingKey) {
           fkValue = entityAsRecord[matchingKey];
@@ -964,7 +971,8 @@ var AggregateBuilder = class _AggregateBuilder {
     });
     const funcSelects = [];
     aggs.forEach(([func, fields]) => {
-      const aliases = (fields ?? []).map((f) => {
+      if (!fields || fields.length === 0) return;
+      const aliases = fields.map((f) => {
         const col = alias ? `\`${alias}\`.\`${String(f)}\`` : `\`${String(f)}\``;
         return [
           `${func}(${col})`,
@@ -1019,7 +1027,8 @@ var AggregateBuilder = class _AggregateBuilder {
       ]
     ];
     return aggs.reduce((cols, [func, fields]) => {
-      const aliases = (fields ?? []).map((f) => this.getAggregateAlias(func, f));
+      if (!fields || fields.length === 0) return cols;
+      const aliases = fields.map((f) => this.getAggregateAlias(func, f));
       return [
         ...cols,
         ...aliases
@@ -1095,14 +1104,34 @@ var AggregateBuilder = class _AggregateBuilder {
   */
   build(qb, aggregate, alias) {
     const metadata = qb.mainAlias?.metadata;
-    const selects = [
-      ...this.createGroupBySelect(aggregate.groupBy, alias, metadata),
-      ...this.createAggSelect("COUNT", aggregate.count, alias, metadata),
-      ...this.createAggSelect("SUM", aggregate.sum, alias, metadata),
-      ...this.createAggSelect("AVG", aggregate.avg, alias, metadata),
-      ...this.createAggSelect("MAX", aggregate.max, alias, metadata),
-      ...this.createAggSelect("MIN", aggregate.min, alias, metadata)
+    const selects = [];
+    selects.push(...this.createGroupBySelect(aggregate.groupBy, alias, metadata));
+    const aggs = [
+      [
+        "COUNT",
+        aggregate.count
+      ],
+      [
+        "SUM",
+        aggregate.sum
+      ],
+      [
+        "AVG",
+        aggregate.avg
+      ],
+      [
+        "MAX",
+        aggregate.max
+      ],
+      [
+        "MIN",
+        aggregate.min
+      ]
     ];
+    aggs.forEach(([func, fields]) => {
+      if (!fields || fields.length === 0) return;
+      selects.push(...this.createAggSelect(func, fields, alias, metadata));
+    });
     if (!selects.length) {
       throw new BadRequestException("No aggregate fields found.");
     }
@@ -1146,9 +1175,13 @@ var RelationQueryService = class {
     if (Array.isArray(dto)) {
       return this.batchQueryRelations(RelationClass, relationName, dto, query);
     }
+    if (this.isRelationClassIdentity(RelationClass, relationName)) {
+      const relationQueryBuilder2 = this.getRelationQueryBuilder(relationName);
+      return await relationQueryBuilder2.selectAndExecute(dto, query);
+    }
     const assembler = AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
-    return assembler.convertAsyncToDTOs(relationQueryBuilder.selectAndExecute(dto, assembler.convertQuery(query)));
+    return assembler.convertToDTOs(await relationQueryBuilder.selectAndExecute(dto, assembler.convertQuery(query)));
   }
   async aggregateRelations(RelationClass, relationName, dto, filter, aggregate) {
     if (Array.isArray(dto)) {
@@ -1179,6 +1212,16 @@ var RelationQueryService = class {
     if (Array.isArray(dto)) {
       return this.batchFindRelations(RelationClass, relationName, dto, opts);
     }
+    if (this.isRelationClassIdentity(RelationClass, relationName)) {
+      const relationQueryBuilder2 = this.getRelationQueryBuilder(relationName);
+      const relations2 = await relationQueryBuilder2.selectAndExecute(dto, {
+        filter: opts?.filter,
+        paging: {
+          limit: 1
+        }
+      });
+      return relations2[0];
+    }
     const assembler = AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     const relations = await relationQueryBuilder.selectAndExecute(dto, {
@@ -1199,10 +1242,20 @@ var RelationQueryService = class {
   */
   async addRelations(relationName, id, relationIds, opts) {
     const entity = await this.getById(id, opts);
+    const meta = this.getRelationMeta(relationName);
     const relations = await this.getRelations(relationName, relationIds, opts?.relationFilter);
     if (!this.foundAllRelations(relationIds, relations)) {
       throw new Error(`Unable to find all ${relationName} to add to ${this.EntityClass.name}`);
     }
+    if (meta.kind === "1:m" && meta.mappedBy) {
+      for (const relation of relations) {
+        wrap(relation).assign({
+          [meta.mappedBy]: entity
+        });
+      }
+      await this.repo.getEntityManager().flush();
+      return entity;
+    }
     const collection = entity[relationName];
     if (collection && typeof collection.add === "function") {
       for (const relation of relations) {
@@ -1223,12 +1276,33 @@ var RelationQueryService = class {
   */
   async setRelations(relationName, id, relationIds, opts) {
     const entity = await this.getById(id, opts);
+    const meta = this.getRelationMeta(relationName);
     const relations = await this.getRelations(relationName, relationIds, opts?.relationFilter);
     if (relationIds.length) {
       if (!this.foundAllRelations(relationIds, relations)) {
         throw new Error(`Unable to find all ${relationName} to set on ${this.EntityClass.name}`);
       }
     }
+    if (meta.kind === "1:m" && meta.mappedBy) {
+      const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
+      const currentRelations = await relationQueryBuilder.selectAndExecute(entity, {});
+      const nextSet = new Set(relations.map((r) => wrap(r).getPrimaryKey()));
+      for (const currentRelation of currentRelations) {
+        const currentPk = wrap(currentRelation).getPrimaryKey();
+        if (!nextSet.has(currentPk)) {
+          wrap(currentRelation).assign({
+            [meta.mappedBy]: null
+          });
+        }
+      }
+      for (const relation of relations) {
+        wrap(relation).assign({
+          [meta.mappedBy]: entity
+        });
+      }
+      await this.repo.getEntityManager().flush();
+      return entity;
+    }
     const collection = entity[relationName];
     if (collection && typeof collection.set === "function") {
       await collection.init();
@@ -1268,10 +1342,20 @@ var RelationQueryService = class {
   */
   async removeRelations(relationName, id, relationIds, opts) {
     const entity = await this.getById(id, opts);
+    const meta = this.getRelationMeta(relationName);
     const relations = await this.getRelations(relationName, relationIds, opts?.relationFilter);
     if (!this.foundAllRelations(relationIds, relations)) {
       throw new Error(`Unable to find all ${relationName} to remove from ${this.EntityClass.name}`);
     }
+    if (meta.kind === "1:m" && meta.mappedBy) {
+      for (const relation of relations) {
+        wrap(relation).assign({
+          [meta.mappedBy]: null
+        });
+      }
+      await this.repo.getEntityManager().flush();
+      return entity;
+    }
     const collection = entity[relationName];
     if (collection && typeof collection.remove === "function") {
       await collection.init();
@@ -1300,14 +1384,25 @@ var RelationQueryService = class {
     const meta = this.getRelationMeta(relationName);
     if (meta.kind === "1:1" || meta.kind === "m:1") {
       const fkFieldName = `${relationName}Id`;
-      const assignData = {
-        [relationName]: null
-      };
-      if (fkFieldName in entity) {
+      const assignData = {};
+      const ownDescriptor = Object.getOwnPropertyDescriptor(entity, fkFieldName);
+      const protoDescriptor = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(entity), fkFieldName);
+      const descriptor = ownDescriptor ?? protoDescriptor;
+      const canAssignFk = fkFieldName in entity && (!descriptor || Boolean(descriptor.set) || descriptor.writable === true);
+      if (canAssignFk) {
         assignData[fkFieldName] = null;
+      } else {
+        assignData[relationName] = null;
       }
       wrap(entity).assign(assignData);
     } else {
+      if (meta.kind === "1:m" && meta.mappedBy) {
+        wrap(relation).assign({
+          [meta.mappedBy]: null
+        });
+        await this.repo.getEntityManager().flush();
+        return entity;
+      }
       const collection = entity[relationName];
       if (collection && typeof collection.remove === "function") {
         await collection.init();
@@ -1328,13 +1423,14 @@ var RelationQueryService = class {
   * @param query - A query to filter, page or sort relations.
   */
   async batchQueryRelations(RelationClass, relationName, entities, query) {
-    const assembler = AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const bypassAssembler = this.isRelationClassIdentity(RelationClass, relationName);
+    const assembler = bypassAssembler ? void 0 : AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
-    const convertedQuery = assembler.convertQuery(query);
+    const convertedQuery = assembler ? assembler.convertQuery(query) : query;
     const results = /* @__PURE__ */ new Map();
     await Promise.all(entities.map(async (entity) => {
       const relations = await relationQueryBuilder.selectAndExecute(entity, convertedQuery);
-      const relationDtos = assembler.convertToDTOs(relations);
+      const relationDtos = bypassAssembler ? relations : await assembler.convertToDTOs(relations);
       if (relationDtos.length > 0) {
         results.set(entity, relationDtos);
       }
@@ -1404,6 +1500,10 @@ var RelationQueryService = class {
     });
     return results;
   }
+  isRelationClassIdentity(RelationClass, relationName) {
+    const relationEntity = this.getRelationEntity(relationName);
+    return RelationClass === relationEntity || RelationClass.name === relationEntity.name;
+  }
   getRelationMeta(relationName) {
     const em = this.repo.getEntityManager();
     const metadata = em.getMetadata().get(this.repo.getEntityName());
@@ -1414,12 +1514,14 @@ var RelationQueryService = class {
     return {
       kind: relationMeta.kind,
       type: relationMeta.type,
-      entity: relationMeta.entity
+      entity: relationMeta.entity,
+      mappedBy: relationMeta.mappedBy
     };
   }
   getRelationEntity(relationName) {
     const relationMeta = this.getRelationMeta(relationName);
-    return relationMeta.entity();
+    const entity = relationMeta.entity();
+    return entity && "class" in entity ? entity.class : entity;
   }
   async getRelations(relationName, ids, filter) {
     const em = this.repo.getEntityManager();
@@ -1481,7 +1583,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
         return data;
       })(this.EntityClass);
       AssemblerDeserializer((d) => {
-        const entity = this.repo.getEntityManager().create(this.EntityClass, instanceToPlain(d));
+        const entity = this.repo.getEntityManager().merge(this.EntityClass, d);
         return entity;
       })(this.EntityClass);
     }
@@ -1492,7 +1594,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     return metadata.class;
   }
   /**
-  * Query for multiple entities, using a Query from `@nestjs-query/core`.
+  * Query for multiple entities, using a Query from `@ptc-org/nestjs-query-core`.
   *
   * @example
   * ```ts
@@ -1778,7 +1880,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     return entity;
   }
   /**
-  * Update multiple entities with a `@nestjs-query/core` Filter.
+  * Update multiple entities with a `@ptc-org/nestjs-query-core` Filter.
   *
   * @example
   * ```ts
@@ -1829,7 +1931,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     return entity;
   }
   /**
-  * Delete multiple records with a `@nestjs-query/core` `Filter`.
+  * Delete multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
   *
   * @example
   *
@@ -1905,7 +2007,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     return entity;
   }
   /**
-  * Restores multiple records with a `@nestjs-query/core` `Filter`.
+  * Restores multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
   *
   * @example
   *