nestjs-query-mikro-orm 0.1.0 → 0.1.2

package/dist/index.d.cts

@@ -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;

package/dist/index.d.ts

@@ -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;

package/dist/index.mjs

@@ -1,9 +1,7 @@
 import { MikroOrmModule, getRepositoryToken } from '@mikro-orm/nestjs';
-import { getFilterFields, AssemblerFactory, AssemblerSerializer, AssemblerDeserializer, getQueryServiceToken } from '@ptc-org/nestjs-query-core';
+import { getFilterFields, AssemblerFactory, getQueryServiceToken } from '@ptc-org/nestjs-query-core';
 import { raw, wrap } from '@mikro-orm/core';
-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';
 
 var __defProp = Object.defineProperty;
@@ -834,7 +832,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];
@@ -1168,6 +1173,10 @@ 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.convertToDTOs(await relationQueryBuilder.selectAndExecute(dto, assembler.convertQuery(query)));
@@ -1201,6 +1210,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, {
@@ -1221,10 +1240,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) {
@@ -1245,12 +1274,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();
@@ -1290,10 +1340,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();
@@ -1322,14 +1382,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();
@@ -1350,13 +1421,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 = await assembler.convertToDTOs(relations);
+      const relationDtos = bypassAssembler ? relations : await assembler.convertToDTOs(relations);
       if (relationDtos.length > 0) {
         results.set(entity, relationDtos);
       }
@@ -1426,6 +1498,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());
@@ -1436,12 +1512,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();
@@ -1485,28 +1563,6 @@ var MikroOrmQueryService = class extends RelationQueryService {
     super(), this.repo = repo;
     this.filterQueryBuilder = opts?.filterQueryBuilder ?? new FilterQueryBuilder(this.repo);
     this.useSoftDelete = opts?.useSoftDelete ?? false;
-    const serializer = getAssemblerSerializer(this.EntityClass);
-    if (!serializer) {
-      AssemblerSerializer((e) => {
-        const json = 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 = wrap(e, true);
-        const ormJson = "toObject" in wrapped ? wrapped.toObject() : {};
-        const data = {
-          ...ormJson,
-          ...jsonWithRemovedEmptyObjects
-        };
-        return data;
-      })(this.EntityClass);
-      AssemblerDeserializer((d) => {
-        const entity = this.repo.getEntityManager().create(this.EntityClass, instanceToPlain(d));
-        return entity;
-      })(this.EntityClass);
-    }
   }
   get EntityClass() {
     const em = this.repo.getEntityManager();