nestjs-query-mikro-orm 0.0.9 → 0.1.1

package/README.md

@@ -30,7 +30,7 @@ The package automatically detects the import method and serves the appropriate f
 pnpm add nestjs-query-mikro-orm
 
 # Install peer dependencies if you haven't already
-pnpm add @mikro-orm/core @nestjs/common @nestjs/core @nestjs-query/core reflect-metadata rxjs
+pnpm add @mikro-orm/core @nestjs/common @nestjs/core @ptc-org/nestjs-query-core reflect-metadata rxjs
 ```
 
 ## Quick Start

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 var nestjs = require('@mikro-orm/nestjs');
-var core = require('@nestjs-query/core');
-var core$1 = require('@mikro-orm/core');
-var assembler_serializer = require('@nestjs-query/core/dist/src/assemblers/assembler.serializer');
+var nestjsQueryCore = require('@ptc-org/nestjs-query-core');
+var core = require('@mikro-orm/core');
+var assembler_serializer = require('@ptc-org/nestjs-query-core/src/assemblers/assembler.serializer');
 var common = require('@nestjs/common');
 var classTransformer = require('class-transformer');
 var merge = require('lodash.merge');
@@ -383,7 +383,7 @@ var FilterQueryBuilder = class {
   }
   getReferencedRelations(filter) {
     const relationNames = this.relationNames;
-    const referencedFields = core.getFilterFields(filter);
+    const referencedFields = nestjsQueryCore.getFilterFields(filter);
     return referencedFields.filter((f) => relationNames.includes(f));
   }
   getReferencedRelationsRecursive(metadataOrFilter = {}, filter) {
@@ -840,7 +840,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];
@@ -970,7 +977,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})`,
@@ -1025,7 +1033,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
@@ -1101,19 +1110,39 @@ 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 common.BadRequestException("No aggregate fields found.");
     }
     selects.forEach(([selectExpr, selectAlias]) => {
-      qb.addSelect(core$1.raw(`${selectExpr} as "${selectAlias}"`));
+      qb.addSelect(core.raw(`${selectExpr} as "${selectAlias}"`));
     });
     return qb;
   }
@@ -1152,15 +1181,19 @@ var RelationQueryService = class {
     if (Array.isArray(dto)) {
       return this.batchQueryRelations(RelationClass, relationName, dto, query);
     }
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    if (this.isRelationClassIdentity(RelationClass, relationName)) {
+      const relationQueryBuilder2 = this.getRelationQueryBuilder(relationName);
+      return await relationQueryBuilder2.selectAndExecute(dto, query);
+    }
+    const assembler = nestjsQueryCore.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)) {
       return this.batchAggregateRelations(RelationClass, relationName, dto, filter, aggregate);
     }
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const assembler = nestjsQueryCore.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     const rawResults = await relationQueryBuilder.aggregate(dto, assembler.convertQuery({
       filter
@@ -1175,7 +1208,7 @@ var RelationQueryService = class {
     if (Array.isArray(dto)) {
       return this.batchCountRelations(RelationClass, relationName, dto, filter);
     }
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const assembler = nestjsQueryCore.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     return relationQueryBuilder.count(dto, assembler.convertQuery({
       filter
@@ -1185,7 +1218,17 @@ var RelationQueryService = class {
     if (Array.isArray(dto)) {
       return this.batchFindRelations(RelationClass, relationName, dto, opts);
     }
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    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 = nestjsQueryCore.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     const relations = await relationQueryBuilder.selectAndExecute(dto, {
       filter: opts?.filter,
@@ -1205,10 +1248,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) {
+        core.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) {
@@ -1229,12 +1282,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) => core.wrap(r).getPrimaryKey()));
+      for (const currentRelation of currentRelations) {
+        const currentPk = core.wrap(currentRelation).getPrimaryKey();
+        if (!nextSet.has(currentPk)) {
+          core.wrap(currentRelation).assign({
+            [meta.mappedBy]: null
+          });
+        }
+      }
+      for (const relation of relations) {
+        core.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();
@@ -1259,7 +1333,7 @@ var RelationQueryService = class {
     if (!relation) {
       throw new Error(`Unable to find ${relationName} to set on ${this.EntityClass.name}`);
     }
-    core$1.wrap(entity).assign({
+    core.wrap(entity).assign({
       [relationName]: relation
     });
     await this.repo.getEntityManager().flush();
@@ -1274,10 +1348,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) {
+        core.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();
@@ -1306,14 +1390,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;
       }
-      core$1.wrap(entity).assign(assignData);
+      core.wrap(entity).assign(assignData);
     } else {
+      if (meta.kind === "1:m" && meta.mappedBy) {
+        core.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();
@@ -1334,13 +1429,14 @@ var RelationQueryService = class {
   * @param query - A query to filter, page or sort relations.
   */
   async batchQueryRelations(RelationClass, relationName, entities, query) {
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const bypassAssembler = this.isRelationClassIdentity(RelationClass, relationName);
+    const assembler = bypassAssembler ? void 0 : nestjsQueryCore.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);
       }
@@ -1355,7 +1451,7 @@ var RelationQueryService = class {
   * @param query - A query to filter, page or sort relations.
   */
   async batchAggregateRelations(RelationClass, relationName, entities, filter, aggregate) {
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const assembler = nestjsQueryCore.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     const convertedQuery = assembler.convertQuery({
       filter
@@ -1376,7 +1472,7 @@ var RelationQueryService = class {
   * @param filter - The filter to apply to the relation query.
   */
   async batchCountRelations(RelationClass, relationName, entities, filter) {
-    const assembler = core.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
+    const assembler = nestjsQueryCore.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
     const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
     const convertedQuery = assembler.convertQuery({
       filter
@@ -1410,6 +1506,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());
@@ -1420,12 +1520,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();
@@ -1471,14 +1573,14 @@ var MikroOrmQueryService = class extends RelationQueryService {
     this.useSoftDelete = opts?.useSoftDelete ?? false;
     const serializer = assembler_serializer.getAssemblerSerializer(this.EntityClass);
     if (!serializer) {
-      core.AssemblerSerializer((e) => {
+      nestjsQueryCore.AssemblerSerializer((e) => {
         const json = classTransformer.instanceToPlain(e, {
           enableImplicitConversion: true,
           excludeExtraneousValues: true,
           exposeDefaultValues: true
         });
         const jsonWithRemovedEmptyObjects = Object.fromEntries(Object.entries(json).filter(([, value]) => !(value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0)));
-        const wrapped = core$1.wrap(e, true);
+        const wrapped = core.wrap(e, true);
         const ormJson = "toObject" in wrapped ? wrapped.toObject() : {};
         const data = {
           ...ormJson,
@@ -1486,8 +1588,8 @@ var MikroOrmQueryService = class extends RelationQueryService {
         };
         return data;
       })(this.EntityClass);
-      core.AssemblerDeserializer((d) => {
-        const entity = this.repo.getEntityManager().create(this.EntityClass, classTransformer.instanceToPlain(d));
+      nestjsQueryCore.AssemblerDeserializer((d) => {
+        const entity = this.repo.getEntityManager().merge(this.EntityClass, d);
         return entity;
       })(this.EntityClass);
     }
@@ -1498,7 +1600,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
@@ -1779,12 +1881,12 @@ var MikroOrmQueryService = class extends RelationQueryService {
     const dateWithClearUndefined = Object.fromEntries(Object.entries(update).filter(([, value]) => value !== void 0));
     this.ensureIdIsNotPresent(dateWithClearUndefined);
     const entity = await this.getById(id, opts);
-    core$1.wrap(entity).assign(dateWithClearUndefined);
+    core.wrap(entity).assign(dateWithClearUndefined);
     await this.repo.getEntityManager().flush();
     return entity;
   }
   /**
-  * Update multiple entities with a `@nestjs-query/core` Filter.
+  * Update multiple entities with a `@ptc-org/nestjs-query-core` Filter.
   *
   * @example
   * ```ts
@@ -1802,7 +1904,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
       filter
     });
     for (const entity of entities) {
-      core$1.wrap(entity).assign(update);
+      core.wrap(entity).assign(update);
     }
     await this.repo.getEntityManager().flush();
     return {
@@ -1825,7 +1927,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     const entity = await this.getById(id, opts);
     const em = this.repo.getEntityManager();
     if (this.useSoftDelete) {
-      core$1.wrap(entity).assign({
+      core.wrap(entity).assign({
         deletedAt: /* @__PURE__ */ new Date()
       });
       await em.flush();
@@ -1835,7 +1937,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
   *
@@ -1854,7 +1956,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
     const em = this.repo.getEntityManager();
     if (this.useSoftDelete) {
       for (const entity of entities) {
-        core$1.wrap(entity).assign({
+        core.wrap(entity).assign({
           deletedAt: /* @__PURE__ */ new Date()
         });
       }
@@ -1904,14 +2006,14 @@ var MikroOrmQueryService = class extends RelationQueryService {
     if (!entity) {
       throw new common.NotFoundException(`Unable to find ${this.EntityClass.name} with id: ${id}`);
     }
-    core$1.wrap(entity).assign({
+    core.wrap(entity).assign({
       deletedAt: null
     });
     await em.flush();
     return entity;
   }
   /**
-  * Restores multiple records with a `@nestjs-query/core` `Filter`.
+  * Restores multiple records with a `@ptc-org/nestjs-query-core` `Filter`.
   *
   * @example
   *
@@ -1932,7 +2034,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
       filters: false
     });
     for (const entity of entities) {
-      core$1.wrap(entity).assign({
+      core.wrap(entity).assign({
         deletedAt: null
       });
     }
@@ -1984,7 +2086,7 @@ var MikroOrmQueryService = class extends RelationQueryService {
 function createMikroOrmQueryServiceProvider(EntityClass, contextName) {
   return {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    provide: core.getQueryServiceToken(EntityClass),
+    provide: nestjsQueryCore.getQueryServiceToken(EntityClass),
     useFactory(repo) {
       return new MikroOrmQueryService(repo);
     },