nestjs-query-mikro-orm 0.0.9 → 0.1.0

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;
@@ -375,7 +375,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 +450,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 +477,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 +504,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;
@@ -375,7 +375,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 +450,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 +477,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 +504,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';
@@ -964,7 +964,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 +1020,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 +1097,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.");
     }
@@ -1148,7 +1170,7 @@ var RelationQueryService = class {
     }
     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)) {
@@ -1334,7 +1356,7 @@ var RelationQueryService = class {
     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 = await assembler.convertToDTOs(relations);
       if (relationDtos.length > 0) {
         results.set(entity, relationDtos);
       }
@@ -1492,7 +1514,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 +1800,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 +1851,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 +1927,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
   *