fix(json-api-nestjs-microorm): replace deprecated faker methods and add PGlite compatibility in MikroORM setup

add transaction for CURRENT_ENTITY_MANAGER_TOKEN transaction for atomic module

Author: klerick

libs/json-api/json-api-nestjs-microorm/src/lib/factory/index.ts

@@ -50,9 +50,7 @@ export function CurrentMicroOrmProvider(
 ): FactoryProvider<MikroORM> {
   return {
     provide: CURRENT_DATA_SOURCE_TOKEN,
-    useFactory: (mikroORM: MikroORM) => {
-      return mikroORM;
-    },
+    useFactory: (mikroORM: MikroORM) => mikroORM,
     inject: [connectionName ? getMikroORMToken(connectionName) : MikroORM],
   };
 }
@@ -132,9 +130,10 @@ export function EntityPropsMap<E extends object>(entities: EntityClass<E>[]) {
 export function RunInTransactionFactory(): FactoryProvider<RunInTransaction> {
   return {
     provide: RUN_IN_TRANSACTION_FUNCTION,
-    inject: [],
-    useFactory() {
-      return async (callback) => callback();
+    inject: [CURRENT_ENTITY_MANAGER_TOKEN],
+    useFactory(entityManager: EntityManager) {
+      return (callback) =>
+        entityManager.transactional(() => callback());
     },
   };
 }

libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/index.ts

@@ -26,23 +26,20 @@ import {
   OrmServiceFactory,
   EntityPropsMap,
 } from '../factory';
-import { MicroOrmUtilService } from '../service/micro-orm-util.service';
+import { MicroOrmUtilService } from '../service';
 
 export * from './entities';
 export * from './utils';
 
-import { sharedConnect, initMikroOrm, pullAllData } from './utils';
+import { initMikroOrm, pullAllData } from './utils';
 import { DEFAULT_ARRAY_TYPE } from '../constants';
 
 export const entities = [Users, UserGroups, Roles, Comments, Addresses, Notes];
 
 export function mockDbPgLiteTestModule(dbName = `test_db_${Date.now()}`) {
   const mikroORM = {
     provide: MikroORM,
-    useFactory: async function () {
-      const knexInst = await sharedConnect();
-      return initMikroOrm(knexInst, dbName);
-    },
+    useFactory: () => initMikroOrm(dbName),
   };
   return {
     module: MikroOrmModule,

libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/utils/init-db.ts

@@ -3,9 +3,6 @@ import { MikroORM } from '@mikro-orm/core';
 import { PostgreSqlDriver } from '@mikro-orm/postgresql';
 import { SqlHighlighter } from '@mikro-orm/sql-highlighter';
 
-import Knex from 'knex';
-import ClientPgLite from 'knex-pglite';
-
 import {
   Addresses,
   Comments,
@@ -14,63 +11,37 @@ import {
   UserGroups,
   Users,
 } from '../entities';
-
-let knexInst: TypeKnex;
-
-export async function sharedConnect(): Promise<TypeKnex> {
-  if (knexInst) {
-    return knexInst;
-  }
-
-  const pgLite = await Promise.all([
-    import('@electric-sql/pglite'),
-    // @ts-ignore
-    import('@electric-sql/pglite/contrib/uuid_ossp'),
-  ]).then(
-    ([{ PGlite }, { uuid_ossp }]) =>
-      new PGlite({
-        extensions: { uuid_ossp },
-      })
-  );
-
-  knexInst = Knex({
-    client: ClientPgLite,
-    dialect: 'postgres',
-    // @ts-ignore
-    connection: { pglite: pgLite },
+import { PGlite } from '@electric-sql/pglite';
+// @ts-ignore
+import { PGliteDriver, PGliteConnectionConfig } from 'mikro-orm-pglite';
+// @ts-ignore
+import { uuid_ossp } from '@electric-sql/pglite/contrib/uuid_ossp';
+
+export async function initMikroOrm(testDbName: string) {
+  const pgLite = new PGlite({
+    extensions: { uuid_ossp },
   });
 
-  return knexInst;
-}
-
-export async function initMikroOrm(knex: TypeKnex, testDbName: string) {
-  const result = await knex.raw(
-    `select 1 from pg_database where datname = '${testDbName}'`
-  );
-
-  if ((result['rows'] as []).length === 0) {
-    await knex.raw(`create database ??`, [testDbName]);
-  }
-
   const orm = await MikroORM.init<PostgreSqlDriver>({
     highlighter: new SqlHighlighter(),
-    driver: PostgreSqlDriver,
+    driver: PGliteDriver,
     dbName: testDbName,
-    driverOptions: knexInst,
+    driverOptions: {
+      connection: {
+        pglite: () => pgLite,
+      } satisfies PGliteConnectionConfig,
+    },
     entities: [Users, UserGroups, Roles, Comments, Addresses, Notes],
     allowGlobalContext: true,
     schema: 'public',
     debug:
       process.env['DB_LOGGING'] !== '0' ? ['query', 'query-params'] : false,
   });
 
-  if ((result['rows'] as []).length === 0) {
-    const sql = await orm.getSchemaGenerator().getCreateSchemaSQL();
-    const statements = sql.split(';').filter((s) => s.trim().length > 0); // Разбиваем на отдельные команды
-
-    for (const statement of statements) {
-      await orm.em.execute(statement);
-    }
+  const sql = await orm.getSchemaGenerator().getCreateSchemaSQL();
+  const statements = sql.split(';').filter((s) => s.trim().length > 0); // Разбиваем на отдельные команды
+  for (const statement of statements) {
+    await orm.em.execute(statement);
   }
 
   return orm;

libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/utils/pull-data.ts

@@ -47,7 +47,7 @@ export async function pullUser() {
   user.firstName = faker.person.firstName();
   user.lastName = faker.person.lastName();
   user.isActive = faker.datatype.boolean();
-  user.login = faker.internet.userName({
+  user.login = faker.internet.username({
     lastName: user.lastName,
     firstName: user.firstName,
   });

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/delete-relationship/delete-relationship.spec.ts

@@ -74,7 +74,7 @@ describe('delete-relationship', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-relationship/get-relationship.spec.ts

@@ -78,7 +78,7 @@ describe('get-relationship', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/patch-one/patch-one.spec.ts

@@ -86,7 +86,7 @@ describe('patch-one', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/patch-relationship/patch-relationship.spec.ts

@@ -63,7 +63,7 @@ describe('patch-relationship', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/post-one/post-one.spec.ts

@@ -82,7 +82,7 @@ describe('post-one', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),

libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/post-relationship/post-relationship.spec.ts

@@ -63,7 +63,7 @@ describe('post-relationshipa', () => {
       firstName: firstName,
       lastName: lastName,
       isActive: faker.datatype.boolean(),
-      login: faker.internet.userName({
+      login: faker.internet.username({
         lastName: firstName,
         firstName: lastName,
       }),