Some refactorings and test work

.npmrc

@@ -0,0 +1 @@
+public-hoist-pattern[]=sqlite3

e2e/e2e-spec.ts

@@ -1,34 +1,40 @@
-import * as request from 'supertest';
+import request, { Response as SuperAgentResponse } from 'supertest';
 import { NestFactory } from '@nestjs/core';
+import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify';
 import { ExpressAdapter, NestExpressApplication } from '@nestjs/platform-express';
+import { Application } from 'express';
+import fastify, { FastifyInstance } from 'fastify';
+import fastifyQs from 'fastify-qs';
 import { ApplicationModule } from './src/app.module';
-import { PaginateQuery, Sort } from '../src';
-import { makeTestData } from './src/testData';
+import { Sort } from '../src';
+import { makeTestData, startDate } from './src/testData';
 import { TestDto } from './src/test.dto';
 import { QueryOrder } from '@mikro-orm/core';
+//import { Test, TestingModule } from '@nestjs/testing';
 
-const defaultPageable: PaginateQuery = {
-  currentPage: 1,
-  offset: 0,
-  itemsPerPage: 10,
-  unpaged: false,
-  totalPages: 100,
-  totalItems: 1000,
-  sortBy: [],
-  filter: {}
-};
+function isFastify(instance: object): instance is FastifyInstance {
+  return Object.hasOwn(instance, 'register');
+}
 
 describe('pageable', () => {
-  let app: NestExpressApplication;
+  let app: NestExpressApplication | NestFastifyApplication;
   let testData: TestDto[];
 
   beforeEach(async () => {
     testData = makeTestData();
-    const express = require('express');
-    const server = express();
-    const adapter = new ExpressAdapter(server);
-    app = await NestFactory.create<NestExpressApplication>(ApplicationModule, adapter, { logger: false });
+
+    app = await NestFactory.create<NestExpressApplication>(ApplicationModule, new ExpressAdapter(), { logger: false });
+    //app = await NestFactory.create<NestFastifyApplication>(ApplicationModule, new FastifyAdapter(), { logger: false });
     await app.init();
+
+    const instance = app.getHttpAdapter().getInstance();
+
+    if (isFastify(instance)) {
+      await instance.register(fastifyQs);
+      await instance.ready();
+    } else {
+      (instance as Application).set('query parser', 'extended');
+    }
   });
 
   afterEach(async () => {
@@ -96,6 +102,23 @@ describe('pageable', () => {
           expect(response.body.data).toStrictEqual(testData.filter((data) => data.id >= 2 && data.id <= 4).map((t) => serialize(t)));
         });
     });
+    it('should support changing the operaand', () => {
+      const ourDatePlusFive = new Date(startDate);
+      ourDatePlusFive.setDate(ourDatePlusFive.getDate() + 5);
+      return request(app.getHttpServer())
+        .get(`/test/change-operand-separator?filter[updatedAt]=${encodeURIComponent(`$lt@@@${ourDatePlusFive.toISOString()}`)}`)
+        .expect(200)
+        .expect((response) => {
+          expect(response.body.data).toStrictEqual(
+            testData
+              .slice(0, 5)
+              .filter((data) => {
+                return data.updatedAt.getTime() <= ourDatePlusFive.getTime();
+              })
+              .map((t) => serialize(t))
+          );
+        });
+    });
   });
 
   describe('sorting', () => {
@@ -114,7 +137,7 @@ describe('pageable', () => {
 
     it('should return the first page with sorting by description (DESC, nulls first)', () => {
       return request(app.getHttpServer())
-        .get('/test?sortBy=property[description];direction[desc];nulls-first[true];')
+        .get('/test?sortBy=property[description];direction[desc];nulls-first[true];&sortBy=property[id];direction[asc];')
         .expect(200)
         .expect((response) => {
           expect(response.body.data).toStrictEqual(
@@ -205,7 +228,7 @@ describe('pageable', () => {
     });
   });
 
-  describe('limit & unpaged', () => {});
+  // describe('limit & unpaged', () => {});
 });
 
 function serialize({ id, title, description, createdAt, updatedAt }: TestDto) {

e2e/src/app.controller.ts

@@ -35,4 +35,9 @@ export class AppController {
   getTestsMaxSize5(@Paginate({ maxSize: 5 }) pageable: PaginateQuery): Promise<PaginateResponse<TestDto>> {
     return this.appService.listTests(pageable);
   }
+
+  @Get('/change-operand-separator')
+  async getChangeOperandSeparator(@Paginate({ operandSeparator: '@@@' }) pageable: PaginateQuery): Promise<PaginateResponse<TestDto>> {
+    return await this.appService.listTests(pageable);
+  }
 }

e2e/src/db/seeders/index.ts

@@ -6,7 +6,7 @@ const testData = makeTestData();
 
 export class DatabaseSeeder extends Seeder {
   async run(em: EntityManager): Promise<void> {
-    for (let i = 0; i < 1000; i++) {
+    for (let i = 0; i < testData.length; i++) {
       em.create('TestEntity', {
         title: testData[i].title,
         description: testData[i].description,

e2e/src/mikro-orm.config.ts

@@ -3,7 +3,9 @@ import { defineConfig } from '@mikro-orm/sqlite';
 export default defineConfig({
   dbName: 'e2e/src/db/test.sqlite3',
   entities: ['e2e/src/**/*.entity.ts'],
+  forceUtcTimezone: true,
   seeder: {
     path: 'e2e/src/db/seeders'
-  }
+  },
+  dynamicImportProvider: (id) => import(id)
 });

e2e/src/test.entity.ts

@@ -16,8 +16,8 @@ export class TestEntity {
   title!: string;
   @Property({ nullable: true })
   description!: string | null;
-  @Property({ type: 'date', onCreate: () => new Date() })
+  @Property({ type: 'timestamp', onCreate: () => new Date() })
   createdAt: Date = new Date();
-  @Property({ type: 'date', onUpdate: () => new Date() })
+  @Property({ type: 'timestamp', onUpdate: () => new Date() })
   updatedAt: Date = new Date();
 }

e2e/src/testData.ts

@@ -1,9 +1,14 @@
 import { TestDto } from './test.dto';
 
+export const startDate = new Date(10000000000);
+
 export const makeTestData = (length = 1000) =>
   Array.from({ length }, (_, i) => {
     const id = i + 1;
-    return new TestDto(id, `Test ${id}`, isPrimeNumber(id) ? null : `Test ${Math.floor(id / 10)} description`, new Date(10000000000), new Date(10000000000));
+    const result = new Date(startDate);
+    result.setDate(result.getDate() + i);
+    return new TestDto(id, `Test ${id}`, isPrimeNumber(id) ? null : `Test ${Math.floor(id / 10)} description`, startDate, result);
+    //return new TestDto(id, `Test ${id}`, isPrimeNumber(id) ? null : `Test ${Math.floor(id / 10)} description`, startDate, startDate);
   });
 
 function isPrimeNumber(num: number): boolean {

eslint.config.ts

@@ -0,0 +1,38 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import { globalIgnores } from 'eslint/config';
+import prettier from 'eslint-plugin-prettier';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+
+export default tseslint.config({
+  // globalIgnores(['e2e/**/*.ts', '**/*.spec.ts']),
+  extends: [eslint.configs.recommended, tseslint.configs.recommended],
+  files: ['src/**/*.ts'],
+  languageOptions: {
+    parserOptions: {
+      projectService: true,
+      tsconfigRootDir: import.meta.dirname
+    }
+  },
+  plugins: {
+    'simple-import-sort': simpleImportSort,
+    prettier: prettier
+  },
+  rules: {
+    'prettier/prettier': 'error',
+    '@typescript-eslint/no-unused-vars': [
+      'warn',
+      {
+        varsIgnorePattern: '^_',
+        argsIgnorePattern: '^_',
+        destructuredArrayIgnorePattern: '^_'
+      }
+    ],
+    curly: 'error',
+    'no-extra-boolean-cast': 'error',
+    // The codebase uses this, so this rule needs to be enabled until those are decided on
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-unsafe-function-type': 'error',
+    '@typescript-eslint/no-empty-function': 'off'
+  }
+});