@solidxai/core 0.1.11-beta.7 → 0.1.11-beta.9

package/src/services/crud-helper.service.ts

@@ -5,6 +5,7 @@ import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { BadRequestException, Logger } from "@nestjs/common";
 import { ERROR_MESSAGES } from "src/constants/error-messages";
+import { buildCastToText } from "src/helpers/typeorm-db-helper";
 
 export enum FilterCombinator {
     AND = '$and',
@@ -101,15 +102,19 @@ export class CrudHelperService {
             case '$eq':
                 qb.andWhere(`${colExpr} = :${uniqueFieldAlias}`, { [uniqueFieldAlias]: normalizedPrimaryOperatorObj.$eq });
                 break;
-            case '$eqi':
-                qb.andWhere(`LOWER(${colExpr}) = :${uniqueFieldAlias}`, { [uniqueFieldAlias]: normalizedPrimaryOperatorObj.$eqi.toLowerCase() });
+            case '$eqi': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) = :${uniqueFieldAlias}`, { [uniqueFieldAlias]: String(normalizedPrimaryOperatorObj.$eqi).toLowerCase() });
                 break;
+            }
             case '$ne':
                 qb.andWhere(`${colExpr} != :${uniqueFieldAlias}`, { [uniqueFieldAlias]: normalizedPrimaryOperatorObj.$ne });
                 break;
-            case '$nei':
-                qb.andWhere(`LOWER(${colExpr}) != :${uniqueFieldAlias}`, { [uniqueFieldAlias]: normalizedPrimaryOperatorObj.$nei.toLowerCase() });
+            case '$nei': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) != :${uniqueFieldAlias}`, { [uniqueFieldAlias]: String(normalizedPrimaryOperatorObj.$nei).toLowerCase() });
                 break;
+            }
             case '$gt':
                 qb.andWhere(`${colExpr} > :${uniqueFieldAlias}`, { [uniqueFieldAlias]: normalizedPrimaryOperatorObj.$gt });
                 break;
@@ -134,12 +139,16 @@ export class CrudHelperService {
             case '$notContains':
                 qb.andWhere(`${colExpr} NOT LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${normalizedPrimaryOperatorObj.$notContains}%` });
                 break;
-            case '$containsi':
-                qb.andWhere(`LOWER(${colExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${normalizedPrimaryOperatorObj.$containsi.toLowerCase()}%` });
+            case '$containsi': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${String(normalizedPrimaryOperatorObj.$containsi).toLowerCase()}%` });
                 break;
-            case '$notContainsi':
-                qb.andWhere(`LOWER(${colExpr}) NOT LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${normalizedPrimaryOperatorObj.$notContainsi.toLowerCase()}%` });
+            }
+            case '$notContainsi': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) NOT LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${String(normalizedPrimaryOperatorObj.$notContainsi).toLowerCase()}%` });
                 break;
+            }
             case '$null':
                 qb.andWhere(`${colExpr} IS NULL`);
                 break;
@@ -152,15 +161,19 @@ export class CrudHelperService {
             case '$startsWith':
                 qb.andWhere(`${colExpr} LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `${normalizedPrimaryOperatorObj.$startsWith}%` });
                 break;
-            case '$startsWithi':
-                qb.andWhere(`LOWER(${colExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `${normalizedPrimaryOperatorObj.$startsWithi.toLowerCase()}%` });
+            case '$startsWithi': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `${String(normalizedPrimaryOperatorObj.$startsWithi).toLowerCase()}%` });
                 break;
+            }
             case '$endsWith':
                 qb.andWhere(`${colExpr} LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${normalizedPrimaryOperatorObj.$endsWith}` });
                 break;
-            case '$endsWithi':
-                qb.andWhere(`LOWER(${colExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${normalizedPrimaryOperatorObj.$endsWithi.toLowerCase()}` });
+            case '$endsWithi': {
+                const castExpr = buildCastToText(this.getDriver(qb), colExpr);
+                qb.andWhere(`LOWER(${castExpr}) LIKE :${uniqueFieldAlias}`, { [uniqueFieldAlias]: `%${String(normalizedPrimaryOperatorObj.$endsWithi).toLowerCase()}` });
                 break;
+            }
             default:
                 throw new Error(`Operator ${operator} is not supported`);
         }

package/src/services/model-metadata.service.ts

@@ -27,6 +27,7 @@ import { PermissionMetadata } from '../entities/permission-metadata.entity';
 import { RoleMetadata } from '../entities/role-metadata.entity';
 import { ViewMetadata } from '../entities/view-metadata.entity';
 import { CommandService } from '../helpers/command.service';
+import { isEmbeddedDb } from '../helpers/environment.helper';
 import { startNodemonHeartbeat } from '../helpers/nodemon-heartbeat';
 import {
   REFRESH_MODEL_COMMAND,
@@ -968,7 +969,7 @@ export class ModelMetadataService {
   @DisallowInProduction()
   async generateCodeViaCtl(modelId: number): Promise<string> {
     const model = await this.findOne(modelId);
-    const isEmbedded = process.env.DEFAULT_DATABASE_DRIVER === 'pglite';
+    const isEmbedded = isEmbeddedDb();
 
     // When using an embedded PGlite database, the single-connection limit means
     // a spawned `solid refresh-model` subprocess cannot get its own DB connection

package/src/services/module-metadata.service.ts

@@ -26,6 +26,7 @@ import {
 } from '../helpers/schematic.service';
 import { CommandService } from '../helpers/command.service';
 import { SolidRegistry } from '../helpers/solid-registry';
+import { isEmbeddedDb } from '../helpers/environment.helper';
 import { startNodemonHeartbeat } from '../helpers/nodemon-heartbeat';
 import { CodeGenerationOptions, ModuleMetadataConfiguration } from '../interfaces';
 import { CrudHelperService } from './crud-helper.service';
@@ -535,7 +536,7 @@ export class ModuleMetadataService {
   @DisallowInProduction()
   async generateCodeViaCtl(moduleId: number): Promise<string> {
     const module = await this.findOne(moduleId);
-    const isEmbedded = process.env.DEFAULT_DATABASE_DRIVER === 'pglite';
+    const isEmbedded = isEmbeddedDb();
 
     // When using an embedded PGlite database, the single-connection limit means
     // a spawned `solid refresh-module` subprocess cannot get its own DB connection

package/src/services/settings/default-settings-provider.service.ts

@@ -114,6 +114,20 @@ const getSolidCoreSettings = (isProd: boolean) =>
         { label: "In Image View", value: "in_image_view" },
       ],
     },
+    {
+      moduleName: "solid-core",
+      key: "rowClickAction",
+      value: "edit",
+      level: SettingLevel.SystemAdminEditable,
+      label: "Row Click Action",
+      group: "app-settings",
+      sortOrder: 45,
+      controlType: "selectionStatic",
+      options: [
+        { label: "Edit", value: "edit" },
+        { label: "View", value: "view" },
+      ],
+    },
     {
       moduleName: "solid-core",
       key: "showAuthContent",

package/src/subscribers/audit.subscriber.ts

@@ -4,6 +4,7 @@ import { lowerFirst } from 'src/helpers/string.helper';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 import { DataSource, EntityMetadata, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';
 import { AuditQueuePayload } from 'src/interfaces';
+import { isEmbeddedDb } from 'src/helpers/environment.helper';
 import { RequestContextService } from 'src/services/request-context.service';
 import { PublisherFactory } from 'src/services/queues/publisher-factory.service';
 const AUDIT_BEFORE_SNAPSHOT = '__auditBeforeSnapshot';
@@ -88,7 +89,10 @@ export class AuditSubscriber implements EntitySubscriberInterface {
      */
     private async prepareManyToManyAuditUpdateSnapshot(event: UpdateEvent<any>, entityId: number | null, updatedColumnNames: string[]): Promise<{ before: any; after: any } | null> {
 
-        const auditRelationFields = (await this.modelMetadataHelperService.loadFieldHierarchy(lowerFirst(event.metadata.name))).filter(field =>
+        // On embedded PGlite, pass the transaction's manager so the query runs
+        // on the active connection. On regular Postgres, use the default DataSource.
+        const mgr = isEmbeddedDb() ? event.manager : this.dataSource;
+        const auditRelationFields = (await this.modelMetadataHelperService.loadFieldHierarchy(lowerFirst(event.metadata.name), isEmbeddedDb() ? event.manager : undefined)).filter(field =>
             field.enableAuditTracking &&
             field.type === 'relation' &&
             field.relationType !== 'one-to-many'
@@ -106,7 +110,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
 
         const relationBefore = event.entity?.[AUDIT_BEFORE_SNAPSHOT] ?? null;
 
-        const relationAfter = await event.manager.getRepository(event.metadata.target as any).findOne({
+        const relationAfter = await mgr.getRepository(event.metadata.target as any).findOne({
             where: { id: entityId } as any,
             relations: relations as any,
         });
@@ -151,7 +155,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
 
         if (batch.length === 0) return;
 
-        if (this.shouldDeferAuditPublish()) {
+        if (isEmbeddedDb()) {
             setImmediate(() => void this.publishAuditBatch(batch));
             return;
         }
@@ -164,12 +168,6 @@ export class AuditSubscriber implements EntitySubscriberInterface {
         this.perTxn.delete(event.queryRunner);
     }
 
-    private shouldDeferAuditPublish(): boolean {
-        const driver = (process.env.DEFAULT_DATABASE_DRIVER ?? '').toLowerCase();
-        const poolMax = Number(process.env.DEFAULT_DATABASE_POOL_MAX ?? 20);
-        return driver === 'pglite' && Number.isFinite(poolMax) && poolMax <= 1;
-    }
-
     private async publishAuditBatch(batch: AuditQueuePayload[]) {
         try {
             // allSettled: publish in parallel; a single failure does not block the rest.

package/src/subscribers/computed-entity-field.subscriber.ts

@@ -1,8 +1,7 @@
 import { camelCase } from 'lodash';
-import { Delete } from "@aws-sdk/client-s3";
 import { forwardRef, Inject, Injectable, InternalServerErrorException, Logger, Scope } from "@nestjs/common";
-import { model } from "mongoose";
 import { ComputedFieldTriggerOperation } from "src/dtos/create-field-metadata.dto";
+import { isEmbeddedDb } from "src/helpers/environment.helper";
 import { ComputedFieldMetadata, SolidRegistry, TypeOrmEventContext } from "src/helpers/solid-registry";
 import { IEntityPreComputeFieldProvider } from "src/interfaces";
 import { PublisherFactory } from "src/services/queues/publisher-factory.service";
@@ -14,19 +13,22 @@ export interface ComputedFieldEvaluationPayload extends ComputedFieldMetadata {
 }
 
 @Injectable({ scope: Scope.TRANSIENT })
-// @EventSubscriber()
 export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface {
     private readonly logger = new Logger(this.constructor.name);
     private dataSource: DataSource;
+
+    // Per-transaction buffer for post-event evaluation jobs. Entries are
+    // flushed in afterTransactionCommit so the publish (which uses the
+    // default DataSource) never races the in-flight transaction's connection.
+    // On PGlite (pool size 1), the flush is deferred via setImmediate to
+    // ensure the transaction's connection has been released first.
+    private perTxn = new WeakMap<any, { computedField: ComputedFieldMetadata<any>; databaseEntity: any }[]>();
+
     constructor(
-        // @InjectDataSource()
-        // private readonly dataSource: DataSource,
         private readonly solidRegistry: SolidRegistry,
         @Inject(forwardRef(() => PublisherFactory))
         private readonly publisherFactory: PublisherFactory<ComputedFieldEvaluationPayload>
-        // private readonly computedFieldPublisher: ComputedFieldEvaluationPublisherDatabase,
     ) {
-        // this.dataSource.subscribers.push(this);
     }
 
     bindToDataSource(dataSource: DataSource) {
@@ -43,47 +45,97 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
     async beforeUpdate(event: UpdateEvent<any>): Promise<any> {
         const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'beforeUpdate');
-        // await this.handleComputedFieldEvaluation(event.databaseEntity, ComputedFieldTriggerOperation.beforeUpdate, modelName, eventContext);
         await this.handleComputedFieldEvaluation(event.entity, ComputedFieldTriggerOperation.beforeUpdate, modelName, eventContext);
     }
 
     afterInsert(event: InsertEvent<any>) {
         const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterInsert');
-        this.handleComputedFieldEvaluationJob(event.entity, ComputedFieldTriggerOperation.afterInsert, modelName, eventContext);
+        this.handlePostEventJobs(event, event.entity, ComputedFieldTriggerOperation.afterInsert, modelName, eventContext);
     }
 
     afterUpdate(event: UpdateEvent<any>) {
         const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterUpdate');
-        // this.handleComputedFieldEvaluationJob(event.databaseEntity, ComputedFieldTriggerOperation.afterUpdate, modelName, eventContext);
-        this.handleComputedFieldEvaluationJob(event.entity, ComputedFieldTriggerOperation.afterUpdate, modelName, eventContext);
+        this.handlePostEventJobs(event, event.entity, ComputedFieldTriggerOperation.afterUpdate, modelName, eventContext);
     }
 
     afterRemove(event: RemoveEvent<any>) {
         const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterRemove');
-        this.handleComputedFieldEvaluationJob(event.databaseEntity, ComputedFieldTriggerOperation.afterRemove, modelName, eventContext);
+        this.handlePostEventJobs(event, event.databaseEntity, ComputedFieldTriggerOperation.afterRemove, modelName, eventContext);
     }
 
     //FIXME: Need to add support for beforeRemove, beforeSoftRemove, afterSoftRemove, beforeRecover, afterRecover
 
-    private async handleComputedFieldEvaluation(entity: any, currentOperation: ComputedFieldTriggerOperation, modelName: string, eventContext?: TypeOrmEventContext): Promise<void> {
-        if (!entity) {
-            return;
-        }
+    // --------- post-event dispatch (pglite vs non-pglite) ----------
+
+    /**
+     * On embedded PGlite (pool size 1): buffer payloads on the queryRunner and
+     * flush in afterTransactionCommit (deferred via setImmediate) so the publish
+     * never tries to get a second connection while the transaction is active.
+     *
+     * On regular Postgres: fire-and-forget publish immediately (original behaviour),
+     * since the pool has spare connections.
+     */
+    private handlePostEventJobs(
+        event: InsertEvent<any> | UpdateEvent<any> | RemoveEvent<any>,
+        entity: any,
+        currentOperation: ComputedFieldTriggerOperation,
+        modelName: string,
+        eventContext?: TypeOrmEventContext,
+    ) {
+        if (!entity) return;
+
         const computedFieldsTobeEvaluated = this.getComputedFieldsForEvaluation(
             this.solidRegistry.getComputedFieldMetadata(),
             currentOperation,
             modelName
         );
-        //TODO: We can add a feature i.e dependsOn, where we can check if the computed field depends on other computed fields and evaluate them first
-        for (const computedField of computedFieldsTobeEvaluated) {
-            await this.evaluateComputedField(this.attachContext(computedField, eventContext), entity, currentOperation);
+        if (computedFieldsTobeEvaluated.length === 0) return;
+
+        if (isEmbeddedDb()) {
+            const qr = event.queryRunner;
+            const arr = this.perTxn.get(qr) ?? [];
+            for (const computedField of computedFieldsTobeEvaluated) {
+                arr.push({
+                    computedField: this.attachContext(computedField, eventContext),
+                    databaseEntity: entity,
+                });
+            }
+            this.perTxn.set(qr, arr);
+        } else {
+            for (const computedField of computedFieldsTobeEvaluated) {
+                this.enqueueComputedFieldEvaluationJob(
+                    this.attachContext(computedField, eventContext),
+                    entity,
+                );
+            }
         }
     }
 
-    private handleComputedFieldEvaluationJob(entity: any, currentOperation: ComputedFieldTriggerOperation, modelName: string, eventContext?: TypeOrmEventContext) {
+    // --------- transaction lifecycle (pglite only) ----------
+    async afterTransactionCommit(event: { queryRunner: any }) {
+        const batch = this.perTxn.get(event.queryRunner) ?? [];
+        this.perTxn.delete(event.queryRunner);
+        if (batch.length === 0) return;
+
+        // Deferred via setImmediate so the transaction's connection is released
+        // back to the (size-1) pool before the publish tries to acquire it.
+        setImmediate(() => void this.flushBatch(batch));
+    }
+
+    afterTransactionRollback(event: { queryRunner: any }) {
+        this.perTxn.delete(event.queryRunner);
+    }
+
+    private async flushBatch(batch: { computedField: ComputedFieldMetadata<any>; databaseEntity: any }[]) {
+        for (const { computedField, databaseEntity } of batch) {
+            this.enqueueComputedFieldEvaluationJob(computedField, databaseEntity);
+        }
+    }
+
+    private async handleComputedFieldEvaluation(entity: any, currentOperation: ComputedFieldTriggerOperation, modelName: string, eventContext?: TypeOrmEventContext): Promise<void> {
         if (!entity) {
             return;
         }
@@ -92,9 +144,8 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
             currentOperation,
             modelName
         );
-        //TODO: We can add a feature i.e dependsOn, where we can check if the computed field depends on other computed fields and evaluate them first
         for (const computedField of computedFieldsTobeEvaluated) {
-            this.enqueueComputedFieldEvaluationJob(this.attachContext(computedField, eventContext), entity, eventContext);
+            await this.evaluateComputedField(this.attachContext(computedField, eventContext), entity, currentOperation);
         }
     }
 
@@ -147,17 +198,14 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
         }
     }
 
-    private enqueueComputedFieldEvaluationJob(computedField: ComputedFieldMetadata<any>, databaseEntity: any, eventContext?: any) {
+    private enqueueComputedFieldEvaluationJob(computedField: ComputedFieldMetadata<any>, databaseEntity: any) {
         const { manager: _manager, ...serializableEventContext } = computedField.eventContext ?? {};
         const payload = {
             ...computedField,
             eventContext: serializableEventContext,
             databaseEntity,
         };
-        this.publisherFactory.publish({ payload }, 'ComputedFieldEvaluationPublisher')
-        // this.computedFieldPublisher.publish({
-        //     payload
-        // });
+        this.publisherFactory.publish({ payload }, 'ComputedFieldEvaluationPublisher');
     }
 
     private attachContext<T extends ComputedFieldMetadata<any>>(computedField: T, eventContext?: any): T {
@@ -176,7 +224,10 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
         const base: TypeOrmEventContext = {
             metadataName: event.metadata?.name,
             eventType: eventType,
-            manager: event.manager,
+            // Only pass the transaction's EntityManager for embedded DB (PGlite),
+            // where a second pooled connection mid-transaction would deadlock.
+            // On regular Postgres, providers use their injected EntityManager.
+            ...(isEmbeddedDb() ? { manager: event.manager } : {}),
         };
         if ("entityId" in event && event.entityId) {
             base.entityId = event.entityId;

package/src/subscribers/scheduled-job.subscriber.ts

@@ -4,6 +4,7 @@ import * as fs from "fs/promises";
 import { CreateScheduledJobDto } from "src/dtos/create-scheduled-job.dto";
 import { ModuleMetadata } from "src/entities/module-metadata.entity";
 import { ScheduledJob } from "src/entities/scheduled-job.entity";
+import { isEmbeddedDb } from "src/helpers/environment.helper";
 import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
 import { ScheduledJobRepository } from "src/repository/scheduled-job.repository";
 import {
@@ -83,7 +84,7 @@ export class ScheduledJobSubscriber
       return;
     }
 
-    const moduleMetadataRepo = event.queryRunner.manager.getRepository(ModuleMetadata);
+    const moduleMetadataRepo = (isEmbeddedDb() ? event.queryRunner.manager : this.dataSource).getRepository(ModuleMetadata);
     const populatedModuleMetadata = await moduleMetadataRepo.findOne({
       where: { id: moduleMetadata.id },
     });
@@ -160,7 +161,7 @@ export class ScheduledJobSubscriber
       (job) => job.scheduleName === jobName
     );
     // Insert or update job in metadata
-    const jobDto: CreateScheduledJobDto = await this.scheduledJobRepo.toDto(populatedScheduleJob as ScheduledJob);
+    const jobDto: CreateScheduledJobDto = await this.scheduledJobRepo.toDto(populatedScheduleJob as ScheduledJob, isEmbeddedDb() ? entityManager : undefined);
     // Strip out bookkeeping/runtime fields before persisting to metadata JSON.
     const {
       moduleId,

package/src/subscribers/security-rule.subscriber.ts

@@ -4,6 +4,7 @@ import * as fs from 'fs/promises'; // Use the Promise-based version of fs for as
 import { SOLID_CORE_MODULE_NAME } from 'src/constants';
 import { ModelMetadata } from 'src/entities/model-metadata.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
+import { isEmbeddedDb } from "src/helpers/environment.helper";
 import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
 import { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from "typeorm";
@@ -40,7 +41,11 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
             return;
         }
 
-        const modelMetadataRepo = event.manager.getRepository(ModelMetadata);
+        // On embedded PGlite, use the transaction's connection to avoid a
+        // second pooled connection mid-transaction. On regular Postgres, use
+        // the default DataSource (original behaviour).
+        const mgr = isEmbeddedDb() ? event.manager : this.dataSource;
+        const modelMetadataRepo = mgr.getRepository(ModelMetadata);
         const populatedModelMetadata = await modelMetadataRepo.findOne({
             where: {
                 id: modelMetadata.id
@@ -67,12 +72,12 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
 
         if (metaData.securityRules) {
             const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);
-            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)
+            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule, isEmbeddedDb() ? event.manager : undefined)
             metaData.securityRules[securityRuleIndex] = { ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) }
         }
         else {
             const securityRules = []
-            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)
+            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule, isEmbeddedDb() ? event.manager : undefined)
             securityRules.push({ ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) })
             metaData.securityRules = securityRules
         }

package/dist-tests/api/authenticate.spec.js

@@ -1,119 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const test_1 = require("@playwright/test");
-const env_1 = require("../helpers/env");
-const baseURL = process.env.API_BASE_URL ?? "http://localhost:3000";
-const TEST_USER_EMAIL = (0, env_1.getRequiredEnv)("TEST_USER_EMAIL");
-const TEST_USER_PASSWORD = (0, env_1.getRequiredEnv)("TEST_USER_PASSWORD");
-function base64UrlDecode(input) {
-    const normalized = input.replace(/-/g, "+").replace(/_/g, "/");
-    const padded = normalized.length % 4 === 0
-        ? normalized
-        : normalized.padEnd(normalized.length + (4 - (normalized.length % 4)), "=");
-    return Buffer.from(padded, "base64").toString("utf-8");
-}
-function validateJwt(token) {
-    const parts = token.split(".");
-    if (parts.length !== 3) {
-        throw new Error("JWT must have three dot-separated parts.");
-    }
-    const headerJson = JSON.parse(base64UrlDecode(parts[0]));
-    const payloadJson = JSON.parse(base64UrlDecode(parts[1]));
-    if (!headerJson || typeof headerJson !== "object") {
-        throw new Error("JWT header must be a JSON object.");
-    }
-    if (!payloadJson || typeof payloadJson !== "object") {
-        throw new Error("JWT payload must be a JSON object.");
-    }
-    if (typeof payloadJson.exp !== "number") {
-        throw new Error("JWT payload.exp must be a number.");
-    }
-    return payloadJson;
-}
-(0, test_1.test)("API: authenticate succeeds with valid credentials", async () => {
-    const api = await test_1.request.newContext({
-        baseURL,
-        extraHTTPHeaders: {
-            accept: "*/*",
-            "content-type": "application/json",
-        },
-    });
-    try {
-        const res = await api.post("/api/iam/authenticate", {
-            data: {
-                email: TEST_USER_EMAIL,
-                username: "",
-                password: TEST_USER_PASSWORD,
-            },
-        });
-        (0, test_1.expect)(res.status()).toBe(200);
-        const json = await res.json();
-        (0, test_1.expect)(json.statusCode).toBe(200);
-        (0, test_1.expect)(Array.isArray(json.message)).toBe(true);
-        (0, test_1.expect)(json.message.length).toBe(0);
-        (0, test_1.expect)(json.error).toBe("");
-        const user = json.data?.user;
-        (0, test_1.expect)(user, "Expected data.user to be an object.").toBeTruthy();
-        (0, test_1.expect)(typeof user).toBe("object");
-        const email = user?.email;
-        (0, test_1.expect)(typeof email).toBe("string");
-        if (email === TEST_USER_EMAIL) {
-            (0, test_1.expect)(email).toBe(TEST_USER_EMAIL);
-        }
-        else {
-            (0, test_1.expect)(email.length).toBeGreaterThan(0);
-        }
-        (0, test_1.expect)(typeof user?.mobile).toBe("string");
-        (0, test_1.expect)(typeof user?.username).toBe("string");
-        (0, test_1.expect)(typeof user?.forcePasswordChange).toBe("boolean");
-        (0, test_1.expect)(typeof user?.id).toBe("number");
-        const roles = user?.roles;
-        (0, test_1.expect)(Array.isArray(roles)).toBe(true);
-        if (Array.isArray(roles)) {
-            (0, test_1.expect)(roles.every((role) => typeof role === "string")).toBe(true);
-            (0, test_1.expect)(roles).toContain("Admin");
-        }
-        const accessToken = json.data?.accessToken;
-        const refreshToken = json.data?.refreshToken;
-        (0, test_1.expect)(typeof accessToken).toBe("string");
-        (0, test_1.expect)(typeof refreshToken).toBe("string");
-        const accessPayload = validateJwt(accessToken);
-        const refreshPayload = validateJwt(refreshToken);
-        (0, test_1.expect)(typeof accessPayload.exp).toBe("number");
-        (0, test_1.expect)(typeof refreshPayload.exp).toBe("number");
-    }
-    finally {
-        await api.dispose();
-    }
-});
-(0, test_1.test)("API: authenticate fails with wrong password", async () => {
-    const api = await test_1.request.newContext({
-        baseURL,
-        extraHTTPHeaders: {
-            accept: "*/*",
-            "content-type": "application/json",
-        },
-    });
-    try {
-        const res = await api.post("/api/iam/authenticate", {
-            data: {
-                email: TEST_USER_EMAIL,
-                username: "",
-                password: `${TEST_USER_PASSWORD}__wrong`,
-            },
-        });
-        (0, test_1.expect)(res.status()).toBe(401);
-        const json = await res.json();
-        (0, test_1.expect)(json.statusCode).toBe(401);
-        (0, test_1.expect)(json.statusCodeMessage).toBe("Unauthorized");
-        (0, test_1.expect)(json.message).toBe("Invalid credentials");
-        (0, test_1.expect)(json.error).toBe("Invalid credentials");
-        (0, test_1.expect)(json.data?.statusCode).toBe(401);
-        (0, test_1.expect)(json.data?.error).toBe("Unauthorized");
-        (0, test_1.expect)(json.data?.message).toBe("Invalid credentials");
-    }
-    finally {
-        await api.dispose();
-    }
-});
-//# sourceMappingURL=authenticate.spec.js.map

package/dist-tests/api/authenticate.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authenticate.spec.js","sourceRoot":"","sources":["../../tests/api/authenticate.spec.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect, request, test } from \"@playwright/test\";\nimport { getRequiredEnv } from \"../helpers/env\";\n\ntype JwtPayload = {\n  exp?: number;\n  [key: string]: unknown;\n};\n\nconst baseURL = process.env.API_BASE_URL ?? \"http://localhost:3000\";\nconst TEST_USER_EMAIL = getRequiredEnv(\"TEST_USER_EMAIL\");\nconst TEST_USER_PASSWORD = getRequiredEnv(\"TEST_USER_PASSWORD\");\n\nfunction base64UrlDecode(input: string): string {\n  const normalized = input.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  const padded =\n    normalized.length % 4 === 0\n      ? normalized\n      : normalized.padEnd(\n        normalized.length + (4 - (normalized.length % 4)),\n        \"=\"\n      );\n  return Buffer.from(padded, \"base64\").toString(\"utf-8\");\n}\n\nfunction validateJwt(token: string): JwtPayload {\n  const parts = token.split(\".\");\n  if (parts.length !== 3) {\n    throw new Error(\"JWT must have three dot-separated parts.\");\n  }\n\n  const headerJson = JSON.parse(base64UrlDecode(parts[0]));\n  const payloadJson = JSON.parse(base64UrlDecode(parts[1]));\n\n  if (!headerJson || typeof headerJson !== \"object\") {\n    throw new Error(\"JWT header must be a JSON object.\");\n  }\n\n  if (!payloadJson || typeof payloadJson !== \"object\") {\n    throw new Error(\"JWT payload must be a JSON object.\");\n  }\n\n  if (typeof payloadJson.exp !== \"number\") {\n    throw new Error(\"JWT payload.exp must be a number.\");\n  }\n\n  return payloadJson as JwtPayload;\n}\n\ntest(\"API: authenticate succeeds with valid credentials\", async () => {\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: {\n      accept: \"*/*\",\n      \"content-type\": \"application/json\",\n    },\n  });\n\n  try {\n    const res = await api.post(\"/api/iam/authenticate\", {\n      data: {\n        email: TEST_USER_EMAIL,\n        username: \"\",\n        password: TEST_USER_PASSWORD,\n      },\n    });\n\n    expect(res.status()).toBe(200);\n    const json = await res.json();\n\n    expect(json.statusCode).toBe(200);\n    expect(Array.isArray(json.message)).toBe(true);\n    expect(json.message.length).toBe(0);\n    expect(json.error).toBe(\"\");\n\n    const user = json.data?.user as Record<string, unknown> | undefined;\n    expect(user, \"Expected data.user to be an object.\").toBeTruthy();\n    expect(typeof user).toBe(\"object\");\n\n    const email = user?.email;\n    expect(typeof email).toBe(\"string\");\n    if (email === TEST_USER_EMAIL) {\n      expect(email).toBe(TEST_USER_EMAIL);\n    } else {\n      // If your API returns a fixed system email, replace this with an exact match.\n      expect((email as string).length).toBeGreaterThan(0);\n    }\n\n    expect(typeof user?.mobile).toBe(\"string\");\n    expect(typeof user?.username).toBe(\"string\");\n    expect(typeof user?.forcePasswordChange).toBe(\"boolean\");\n    expect(typeof user?.id).toBe(\"number\");\n\n    const roles = user?.roles;\n    expect(Array.isArray(roles)).toBe(true);\n    if (Array.isArray(roles)) {\n      expect(roles.every((role) => typeof role === \"string\")).toBe(true);\n      expect(roles).toContain(\"Admin\");\n    }\n\n    const accessToken = json.data?.accessToken;\n    const refreshToken = json.data?.refreshToken;\n    expect(typeof accessToken).toBe(\"string\");\n    expect(typeof refreshToken).toBe(\"string\");\n\n    const accessPayload = validateJwt(accessToken as string);\n    const refreshPayload = validateJwt(refreshToken as string);\n\n    expect(typeof accessPayload.exp).toBe(\"number\");\n    expect(typeof refreshPayload.exp).toBe(\"number\");\n  } finally {\n    await api.dispose();\n  }\n});\n\ntest(\"API: authenticate fails with wrong password\", async () => {\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: {\n      accept: \"*/*\",\n      \"content-type\": \"application/json\",\n    },\n  });\n\n  try {\n    const res = await api.post(\"/api/iam/authenticate\", {\n      data: {\n        email: TEST_USER_EMAIL,\n        username: \"\",\n        password: `${TEST_USER_PASSWORD}__wrong`,\n      },\n    });\n\n    expect(res.status()).toBe(401);\n    const json = await res.json();\n\n    expect(json.statusCode).toBe(401);\n    expect(json.statusCodeMessage).toBe(\"Unauthorized\");\n    expect(json.message).toBe(\"Invalid credentials\");\n    expect(json.error).toBe(\"Invalid credentials\");\n    expect(json.data?.statusCode).toBe(401);\n    expect(json.data?.error).toBe(\"Unauthorized\");\n    expect(json.data?.message).toBe(\"Invalid credentials\");\n  } finally {\n    await api.dispose();\n  }\n});\n"]}