@ruiapp/rapid-core 0.1.52 → 0.1.54

package/dist/core/eventManager.d.ts

@@ -2,5 +2,5 @@ export default class EventManager<EventTypes extends Record<string, any[]>> {
     #private;
     constructor();
     on<K extends keyof EventTypes>(eventName: K, listener: (...args: EventTypes[K]) => void): void;
-    emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]): boolean;
+    emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]): Promise<void>;
 }

package/dist/index.js

@@ -726,8 +726,11 @@ class EventManager {
     on(eventName, listener) {
         this.#eventEmitter.on(eventName, listener);
     }
-    emit(eventName, ...args) {
-        return this.#eventEmitter.emit(eventName, ...args);
+    async emit(eventName, ...args) {
+        const listeners = this.#eventEmitter.listeners(eventName);
+        for (const listener of listeners) {
+            await listener(...args);
+        }
     }
 }
 
@@ -2110,6 +2113,7 @@ async function findEntities(server, dataAccessor, options) {
     }
     const entities = rows.map((item) => mapDbRowToEntity(server, model, item, options.keepNonPropertyFields));
     await server.emitEvent("entity.beforeResponse", {
+        routerContext: options.routerContext,
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         baseModelSingularCode: model.base,
@@ -2404,6 +2408,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
     const { entity } = options;
     await server.beforeCreateEntity(model, options);
     await server.emitEvent("entity.beforeCreate", {
+        routerContext: options.routerContext,
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         baseModelSingularCode: model.base,
@@ -2544,6 +2549,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
         }
     }
     await server.emitEvent("entity.create", {
+        routerContext: options.routerContext,
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         baseModelSingularCode: model.base,
@@ -3181,7 +3187,7 @@ class RapidServer {
     async beforeUpdateEntity(model, options, currentEntity) {
         await this.#pluginManager.beforeUpdateEntity(model, options, currentEntity);
     }
-    #handleEntityEvent(eventName, sender, payload) {
+    async #handleEntityEvent(eventName, sender, payload) {
         const { modelSingularCode, baseModelSingularCode } = payload;
         const entityWatchHandlerContext = {
             server: this,
@@ -3215,9 +3221,9 @@ class RapidServer {
         else if (eventName === "entity.beforeResponse") {
             emitter = this.#entityBeforeResponseEventEmitters;
         }
-        emitter.emit(modelSingularCode, entityWatchHandlerContext);
+        await emitter.emit(modelSingularCode, entityWatchHandlerContext);
         if (baseModelSingularCode) {
-            emitter.emit(baseModelSingularCode, entityWatchHandlerContext);
+            await emitter.emit(baseModelSingularCode, entityWatchHandlerContext);
         }
     }
 }
@@ -3756,6 +3762,7 @@ const code$m = "findCollectionEntities";
 async function handler$m(plugin, ctx, options) {
     await runCollectionEntityActionHandler(ctx, options, code$m, async (entityManager, input) => {
         input.filters = removeFiltersWithNullValue(input.filters);
+        input.routerContext = ctx.routerContext;
         const entities = await entityManager.findEntities(input);
         const result = { list: entities };
         if (input.pagination && !input.pagination.withoutTotal) {
@@ -3819,6 +3826,7 @@ async function handler$j(plugin, ctx, options) {
     const entityManager = server.getEntityManager(options.singularCode);
     const output = await entityManager.createEntity({
         entity: input,
+        routerContext: ctx.routerContext,
     }, plugin);
     ctx.output = output;
 }
@@ -3848,6 +3856,7 @@ async function handler$i(plugin, ctx, options) {
         const entityManager = server.getEntityManager(options.singularCode);
         const newEntity = await entityManager.createEntity({
             entity: mergedEntity,
+            routerContext: ctx.routerContext,
         }, plugin);
         output.push(newEntity);
     }
@@ -3908,6 +3917,7 @@ async function handler$f(plugin, ctx, options) {
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
     logger.debug(`Running ${code$f} handler...`, { defaultInput, fixedInput, mergedInput });
     const entityManager = server.getEntityManager(options.singularCode);
+    mergedInput.routerContext = ctx.routerContext;
     await entityManager.addRelations(mergedInput, plugin);
     ctx.output = {};
 }

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { RouteContext } from "./core/routeContext";
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { CountRowOptions, FindRowOptions } from "./dataAccess/dataAccessTypes";
 export type RapidServerConfig = {
@@ -66,18 +67,21 @@ export type RpdServerEventTypes = {
     "entity.beforeResponse": [RapidPlugin, RpdEntityBeforeResponseEventPayload];
 };
 export interface RpdEntityBeforeCreateEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
     before: any;
 }
 export interface RpdEntityCreateEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
     after: any;
 }
 export interface RpdEntityBeforeUpdateEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
@@ -85,6 +89,7 @@ export interface RpdEntityBeforeUpdateEventPayload {
     changes: any;
 }
 export interface RpdEntityUpdateEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
@@ -93,18 +98,21 @@ export interface RpdEntityUpdateEventPayload {
     changes: any;
 }
 export interface RpdEntityBeforeDeleteEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
     before: any;
 }
 export interface RpdEntityDeleteEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
     before: any;
 }
 export interface RpdEntityAddRelationsEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
@@ -113,6 +121,7 @@ export interface RpdEntityAddRelationsEventPayload {
     relations: any[];
 }
 export interface RpdEntityRemoveRelationsEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
@@ -121,6 +130,7 @@ export interface RpdEntityRemoveRelationsEventPayload {
     relations: any[];
 }
 export interface RpdEntityBeforeResponseEventPayload {
+    routerContext?: RouteContext;
     namespace: string;
     modelSingularCode: string;
     baseModelSingularCode?: string;
@@ -335,6 +345,7 @@ export type EntityFilterOperators = EntityFilterRelationalOperators | EntityFilt
 export type EntityFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityLogicalFilterOptions | FindEntityUnaryFilterOptions | FindEntityExistenceFilterOptions;
 export type EntityNonRelationPropertyFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityUnaryFilterOptions;
 export interface FindEntityOptions {
+    routerContext?: RouteContext;
     filters?: EntityFilterOptions[];
     orderBy?: FindEntityOrderByOptions[];
     pagination?: FindEntityPaginationOptions;
@@ -381,22 +392,27 @@ export interface CountEntityResult {
     count: number;
 }
 export interface CreateEntityOptions {
+    routerContext?: RouteContext;
     entity: any;
 }
 export interface UpdateEntityOptions {
+    routerContext?: RouteContext;
     filters?: EntityFilterOptions[];
     entity: any;
 }
 export interface UpdateEntityByIdOptions {
+    routerContext?: RouteContext;
     id: any;
     entityToSave: any;
     operation?: any;
     stateProperties?: string[];
 }
 export interface DeleteEntityOptions {
+    routerContext?: RouteContext;
     filters?: EntityFilterOptions[];
 }
 export interface AddEntityRelationsOptions {
+    routerContext?: RouteContext;
     id: number;
     property: string;
     relations: {
@@ -405,6 +421,7 @@ export interface AddEntityRelationsOptions {
     }[];
 }
 export interface RemoveEntityRelationsOptions {
+    routerContext?: RouteContext;
     id: number;
     property: string;
     relations: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/eventManager.ts

@@ -11,7 +11,10 @@ export default class EventManager<EventTypes extends Record<string, any[]>> {
     this.#eventEmitter.on(eventName as string, listener);
   }
 
-  emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]) {
-    return this.#eventEmitter.emit(eventName as string, ...args);
+  async emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]) {
+    const listeners = this.#eventEmitter.listeners(eventName as string);
+    for (const listener of listeners) {
+      await listener(...args);
+    }
   }
 }

package/src/dataAccess/entityManager.ts

@@ -196,6 +196,7 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
   await server.emitEvent(
     "entity.beforeResponse",
     {
+      routerContext: options.routerContext,
       namespace: model.namespace,
       modelSingularCode: model.singularCode,
       baseModelSingularCode: model.base,
@@ -512,6 +513,7 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
   await server.emitEvent(
     "entity.beforeCreate",
     {
+      routerContext: options.routerContext,
       namespace: model.namespace,
       modelSingularCode: model.singularCode,
       baseModelSingularCode: model.base,
@@ -665,6 +667,7 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
   await server.emitEvent(
     "entity.create",
     {
+      routerContext: options.routerContext,
       namespace: model.namespace,
       modelSingularCode: model.singularCode,
       baseModelSingularCode: model.base,

package/src/plugins/dataManage/actionHandlers/addEntityRelations.ts

@@ -1,4 +1,4 @@
-import { RunEntityActionHandlerOptions } from "~/types";
+import { AddEntityRelationsOptions, RunEntityActionHandlerOptions } from "~/types";
 import { mergeInput } from "~/helpers/inputHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -9,10 +9,11 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const { logger, server, input } = ctx;
 
   const { defaultInput, fixedInput } = options;
-  const mergedInput = mergeInput(defaultInput, input, fixedInput);
+  const mergedInput: AddEntityRelationsOptions = mergeInput(defaultInput, input, fixedInput);
   logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const entityManager = server.getEntityManager(options.singularCode);
+  mergedInput.routerContext = ctx.routerContext;
   await entityManager.addRelations(mergedInput, plugin);
 
   ctx.output = {};

package/src/plugins/dataManage/actionHandlers/createCollectionEntitiesBatch.ts

@@ -30,6 +30,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
     const newEntity = await entityManager.createEntity(
       {
         entity: mergedEntity,
+        routerContext: ctx.routerContext,
       },
       plugin,
     );

package/src/plugins/dataManage/actionHandlers/createCollectionEntity.ts

@@ -21,6 +21,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const output = await entityManager.createEntity(
     {
       entity: input,
+      routerContext: ctx.routerContext,
     },
     plugin,
   );

package/src/plugins/dataManage/actionHandlers/findCollectionEntities.ts

@@ -9,6 +9,7 @@ export const code = "findCollectionEntities";
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions) {
   await runCollectionEntityActionHandler(ctx, options, code, async (entityManager, input: FindEntityOptions) => {
     input.filters = removeFiltersWithNullValue(input.filters);
+    input.routerContext = ctx.routerContext;
     const entities = await entityManager.findEntities(input);
     const result: {
       list: any;

package/src/server.ts

@@ -392,7 +392,7 @@ export class RapidServer implements IRpdServer {
     await this.#pluginManager.beforeUpdateEntity(model, options, currentEntity);
   }
 
-  #handleEntityEvent(eventName: keyof RpdServerEventTypes, sender: RapidPlugin, payload: RpdEntityCreateEventPayload) {
+  async #handleEntityEvent(eventName: keyof RpdServerEventTypes, sender: RapidPlugin, payload: RpdEntityCreateEventPayload) {
     const { modelSingularCode, baseModelSingularCode } = payload;
     const entityWatchHandlerContext: EntityWatchHandlerContext<typeof eventName> = {
       server: this,
@@ -420,9 +420,9 @@ export class RapidServer implements IRpdServer {
       emitter = this.#entityBeforeResponseEventEmitters;
     }
 
-    emitter.emit(modelSingularCode, entityWatchHandlerContext);
+    await emitter.emit(modelSingularCode, entityWatchHandlerContext);
     if (baseModelSingularCode) {
-      emitter.emit(baseModelSingularCode, entityWatchHandlerContext);
+      await emitter.emit(baseModelSingularCode, entityWatchHandlerContext);
     }
   }
 }

package/src/types.ts

@@ -1,3 +1,4 @@
+import { RouteContext } from "./core/routeContext";
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { CountRowOptions, FindRowOptions } from "./dataAccess/dataAccessTypes";
 
@@ -79,6 +80,7 @@ export type RpdServerEventTypes = {
 };
 
 export interface RpdEntityBeforeCreateEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -86,6 +88,7 @@ export interface RpdEntityBeforeCreateEventPayload {
 }
 
 export interface RpdEntityCreateEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -93,6 +96,7 @@ export interface RpdEntityCreateEventPayload {
 }
 
 export interface RpdEntityBeforeUpdateEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -101,6 +105,7 @@ export interface RpdEntityBeforeUpdateEventPayload {
 }
 
 export interface RpdEntityUpdateEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -110,6 +115,7 @@ export interface RpdEntityUpdateEventPayload {
 }
 
 export interface RpdEntityBeforeDeleteEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -117,6 +123,7 @@ export interface RpdEntityBeforeDeleteEventPayload {
 }
 
 export interface RpdEntityDeleteEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -124,6 +131,7 @@ export interface RpdEntityDeleteEventPayload {
 }
 
 export interface RpdEntityAddRelationsEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -133,6 +141,7 @@ export interface RpdEntityAddRelationsEventPayload {
 }
 
 export interface RpdEntityRemoveRelationsEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -142,6 +151,7 @@ export interface RpdEntityRemoveRelationsEventPayload {
 }
 
 export interface RpdEntityBeforeResponseEventPayload {
+  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -389,6 +399,7 @@ export type EntityFilterOptions = FindEntityRelationalFilterOptions | FindEntity
 export type EntityNonRelationPropertyFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityUnaryFilterOptions;
 
 export interface FindEntityOptions {
+  routerContext?: RouteContext;
   filters?: EntityFilterOptions[];
   orderBy?: FindEntityOrderByOptions[];
   pagination?: FindEntityPaginationOptions;
@@ -445,15 +456,18 @@ export interface CountEntityResult {
 }
 
 export interface CreateEntityOptions {
+  routerContext?: RouteContext;
   entity: any;
 }
 
 export interface UpdateEntityOptions {
+  routerContext?: RouteContext;
   filters?: EntityFilterOptions[];
   entity: any;
 }
 
 export interface UpdateEntityByIdOptions {
+  routerContext?: RouteContext;
   id: any;
   entityToSave: any;
   operation?: any;
@@ -461,16 +475,19 @@ export interface UpdateEntityByIdOptions {
 }
 
 export interface DeleteEntityOptions {
+  routerContext?: RouteContext;
   filters?: EntityFilterOptions[];
 }
 
 export interface AddEntityRelationsOptions {
+  routerContext?: RouteContext;
   id: number;
   property: string;
   relations: { id?: number; [k: string]: any }[];
 }
 
 export interface RemoveEntityRelationsOptions {
+  routerContext?: RouteContext;
   id: number;
   property: string;
   relations: { id?: number; [k: string]: any }[];