fix(tests): fix jest-extended typings and eslint problems

TriPSs · Sep 30, 2021 · 6af8af1 · 6af8af1
1 parent f539b29
commit 6af8af1
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 41 deletions.
diff --git a/jest.e2e.config.js b/jest.e2e.config.js
@@ -8,5 +8,6 @@ module.exports = {
   moduleNameMapper: {
     '^@nestjs-query/(.*)$': '<rootDir>/packages/$1/src',
   },
+  "setupFilesAfterEnv": ["jest-extended"],
   snapshotSerializers: ['jest-snapshot-serializer-raw/always']
 };
diff --git a/jest.unit.config.js b/jest.unit.config.js
@@ -8,5 +8,6 @@ module.exports = {
   moduleNameMapper: {
     '^@nestjs-query/(.*)$': '<rootDir>/packages/$1/src',
   },
+  "setupFilesAfterEnv": ["jest-extended"],
   snapshotSerializers: ['jest-snapshot-serializer-raw/always']
 };
diff --git a/packages/query-typeorm/__tests__/query/__snapshots__/relation-query.builder.spec.ts.snap b/packages/query-typeorm/__tests__/query/__snapshots__/relation-query.builder.spec.ts.snap
diff --git a/packages/query-typeorm/__tests__/query/filter-query.builder.spec.ts b/packages/query-typeorm/__tests__/query/filter-query.builder.spec.ts
@@ -48,7 +48,7 @@ describe('FilterQueryBuilder', (): void => {
         oneTestRelation: { relationOfTestRelation: {} },
       });
     });
-    it('with nested and / or',  () => {
+    it('with nested and / or', () => {
       const mockWhereBuilder = mock<WhereBuilder<TestEntity>>(WhereBuilder);
       const qb = getEntityQueryBuilder(TestEntity, instance(mockWhereBuilder));
       expect(

diff --git a/packages/query-typeorm/__tests__/services/typeorm-query.service.spec.ts b/packages/query-typeorm/__tests__/services/typeorm-query.service.spec.ts
@@ -1,4 +1,3 @@
-import 'jest-extended';
 import { Filter, SortDirection } from '@nestjs-query/core';
 import { Test, TestingModule } from '@nestjs/testing';
 import { plainToClass } from 'class-transformer';
@@ -156,10 +155,10 @@ describe('TypeOrmQueryService', (): void => {
               },
             },
           });
-          expect(queryResults).toBeArrayOfSize(6)
+          expect(queryResults).toBeArrayOfSize(6);
           queryResults.map((e, idx) => {
-            expect(e).toMatchObject(TEST_RELATIONS[idx])
-          })
+            expect(e).toMatchObject(TEST_RELATIONS[idx]);
+          });
         });
 
         it('should allow filtering on a uni directional many to one relation', async () => {
@@ -173,10 +172,10 @@ describe('TypeOrmQueryService', (): void => {
               },
             },
           });
-          expect(queryResults).toBeArrayOfSize(6)
+          expect(queryResults).toBeArrayOfSize(6);
           queryResults.map((e, idx) => {
-            expect(e).toMatchObject(TEST_RELATIONS[idx])
-          })
+            expect(e).toMatchObject(TEST_RELATIONS[idx]);
+          });
         });
 
         it('should allow filtering on a many to one relation with paging', async () => {
@@ -197,10 +196,10 @@ describe('TypeOrmQueryService', (): void => {
             sorting: [{ field: 'testRelationPk', direction: SortDirection.ASC }],
             paging: { limit: 3 },
           });
-          expect(queryResults).toBeArrayOfSize(3)
+          expect(queryResults).toBeArrayOfSize(3);
           queryResults.map((e, idx) => {
-            expect(e).toMatchObject(TEST_RELATIONS[idx])
-          })
+            expect(e).toMatchObject(TEST_RELATIONS[idx]);
+          });
         });
       });
 
@@ -617,7 +616,9 @@ describe('TypeOrmQueryService', (): void => {
         it('call select and return the with a uni-directional relation', async () => {
           const entity = TEST_ENTITIES[2];
           const queryService = moduleRef.get(TestEntityService);
-          const queryResult = (await queryService.queryRelations(TestRelation, 'manyToManyUniDirectional', entity, {})).map((r) => {
+          const queryResult = (
+            await queryService.queryRelations(TestRelation, 'manyToManyUniDirectional', entity, {})
+          ).map((r) => {
             delete r.relationOfTestRelationId;
             return r;
           });

diff --git a/packages/query-typeorm/src/query/filter-query.builder.ts b/packages/query-typeorm/src/query/filter-query.builder.ts
@@ -270,28 +270,21 @@ export class FilterQueryBuilder<Entity> {
   }
 
   getReferencedRelationsRecursive(metadata: EntityMetadata, filter: Filter<unknown> = {}): NestedRecord {
-    const referencedFields = Array.from(new Set(Object.keys(filter)));
+    const referencedFields = Array.from(new Set(Object.keys(filter) as (keyof Filter<unknown>)[]));
     return referencedFields.reduce((prev, curr) => {
-      if (filter.and) {
-        for (const andFilter of filter.and) {
-          prev = merge(prev, this.getReferencedRelationsRecursive(metadata, andFilter));
-        }
-      }
-      if (filter.or) {
-        for (const orFilter of filter.or) {
-          prev = merge(prev, this.getReferencedRelationsRecursive(metadata, orFilter));
+      const currFilterValue = filter[curr];
+      if ((curr === 'and' || curr === 'or') && currFilterValue) {
+        for (const subFilter of currFilterValue) {
+          prev = merge(prev, this.getReferencedRelationsRecursive(metadata, subFilter));
         }
       }
       const referencedRelation = metadata.relations.find((r) => r.propertyName === curr);
       if (!referencedRelation) return prev;
       return {
         ...prev,
         [curr]: merge(
-          (prev as Record<string, any>)[curr],
-          this.getReferencedRelationsRecursive(
-            referencedRelation.inverseEntityMetadata,
-            (filter as Record<string, Filter<unknown>>)[curr],
-          ),
+          (prev as NestedRecord)[curr],
+          this.getReferencedRelationsRecursive(referencedRelation.inverseEntityMetadata, currFilterValue),
         ),
       };
     }, {});

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -18,7 +18,8 @@
         "noImplicitReturns": true,
         "pretty": true,
         "strict": true,
-        "noUnusedLocals": true
+        "noUnusedLocals": true,
+        "types": ["jest-extended"]
     },
     "exclude": ["node_modules"]
 }