@ruiapp/rapid-core 0.11.0 → 0.11.2

package/dist/core/actionHandlers/ifActionHandler.d.ts

@@ -0,0 +1,11 @@
+import { ActionHandlerContext, IPluginActionHandler } from "../../core/actionHandler";
+import { RpdRouteActionConfig } from "../../types";
+export declare const code = "if";
+export type IfActionHandlerConfig = {
+    condition: string;
+    then: RpdRouteActionConfig[];
+    otherwise: RpdRouteActionConfig[];
+};
+export declare function handler(_plugin: any, ctx: ActionHandlerContext, options: IfActionHandlerConfig): Promise<void>;
+declare const _default: IPluginActionHandler;
+export default _default;

package/dist/index.js

@@ -2676,7 +2676,7 @@ function mapEntityToDbRow(server, model, entity) {
         return result;
     }
     const propertyNames = Object.keys(entity);
-    propertyNames.forEach((propertyName) => {
+    for (const propertyName of propertyNames) {
         let columnName = propertyName;
         const property = getEntityPropertyByCode(server, model, propertyName);
         if (property) {
@@ -2701,7 +2701,7 @@ function mapEntityToDbRow(server, model, entity) {
                 }
             }
         }
-    });
+    }
     return result;
 }
 
@@ -4411,13 +4411,13 @@ class EntityManager {
     async addRelations(options, plugin) {
         const server = this.#server;
         const model = this.getModel();
-        const { id, property, relations, routeContext } = options;
+        const { id: selfId, property, relations, routeContext } = options;
         const entity = await this.findById({
-            id,
+            id: selfId,
             routeContext,
         });
         if (!entity) {
-            throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
+            throw new Error(`${model.namespace}.${model.singularCode}  with id "${selfId}" was not found.`);
         }
         const relationProperty = getEntityPropertyByCode(server, model, property);
         if (!relationProperty) {
@@ -4438,10 +4438,21 @@ class EntityManager {
         FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
         WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
       )`;
-                const params = [id, relation.id];
+                const targetId = relation[relationProperty.targetIdColumnName] || relation.id;
+                const params = [selfId, targetId];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
             }
         }
+        else {
+            const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+            for (const relation of relations) {
+                relation[relationProperty.selfIdColumnName] = selfId;
+                await targetEntityManager.createEntity({
+                    routeContext,
+                    entity: relation,
+                });
+            }
+        }
         await server.emitEvent({
             eventName: "entity.addRelations",
             payload: {
@@ -4504,9 +4515,9 @@ var healthz = {
     type: "RESTful",
     method: "GET",
     endpoint: "/healthz",
-    handler: handler$y,
+    handler: handler$z,
 };
-async function handler$y(ctx) {
+async function handler$z(ctx) {
     ctx.output = {};
 }
 
@@ -4549,6 +4560,19 @@ function interpreteConfigExpressions(config, vars) {
     }
 }
 
+const code$y = "if";
+async function handler$y(_plugin, ctx, options) {
+    const { server, input, routerContext: routeContext } = ctx;
+    const { condition, then, otherwise } = options;
+    const conditionResult = interpreteExpression(condition, ctx.vars);
+    const actions = conditionResult ? then : otherwise;
+    if (!actions || !actions.length) {
+        return;
+    }
+    await server.runActionHandlers(ctx, actions);
+}
+var ifActionHandler = { code: code$y, handler: handler$y };
+
 class RapidServer {
     #logger;
     #facilityFactories;
@@ -4785,6 +4809,8 @@ class RapidServer {
     }
     async start() {
         this.#logger.info("Starting rapid server...");
+        // register core action handlers
+        this.registerActionHandler(null, ifActionHandler);
         const pluginManager = this.#pluginManager;
         await pluginManager.loadPlugins(this.#plugins);
         await pluginManager.initPlugins();
@@ -4916,7 +4942,7 @@ class RapidServer {
         return response.getResponse();
     }
     async runActionHandlers(handlerContext, actions) {
-        if (!actions) {
+        if (!actions || !actions.length) {
             return;
         }
         for (const action of actions) {
@@ -4927,8 +4953,7 @@ class RapidServer {
                 throw new Error("Unknown handler: " + actionCode);
             }
             await this.beforeRunActionHandler(handlerContext, action);
-            const result = await handler(handlerContext, action.config);
-            handlerContext.results.push(result);
+            await handler(handlerContext, action.config);
         }
     }
     async beforeRunRouteActions(handlerContext) {

package/dist/types.d.ts

@@ -666,8 +666,8 @@ export interface RemoveEntityRelationsOptions {
         [k: string]: any;
     }[];
 }
-export type EntityWatcherType = EntityWatcher<"entity.create"> | EntityWatcher<"entity.update"> | EntityWatcher<"entity.delete"> | EntityWatcher<"entity.addRelations"> | EntityWatcher<"entity.removeRelations"> | EntityWatcher<any>;
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes = any> {
+export type EntityWatcherType = EntityWatcher<"entity.beforeCreate"> | EntityWatcher<"entity.create"> | EntityWatcher<"entity.beforeUpdate"> | EntityWatcher<"entity.update"> | EntityWatcher<"entity.beforeDelete"> | EntityWatcher<"entity.delete"> | EntityWatcher<"entity.addRelations"> | EntityWatcher<"entity.removeRelations"> | EntityWatcher<"entity.beforeResponse"> | EntityWatcher<any>;
+export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
     eventName: TEventName;
     modelSingularCode: string;
     handler: EntityWatchHandler<TEventName>;

package/package.json

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

package/src/core/actionHandlers/ifActionHandler.ts

@@ -0,0 +1,27 @@
+import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "~/core/actionHandler";
+import { generatePasswordHash, validatePassword } from "~/utilities/passwordUtility";
+import { interpreteConfigExpressions, interpreteExpression } from "../ExpressionInterpreter";
+import { RpdRouteActionConfig } from "~/types";
+
+export const code = "if";
+
+export type IfActionHandlerConfig = {
+  condition: string;
+  then: RpdRouteActionConfig[];
+  otherwise: RpdRouteActionConfig[];
+};
+
+export async function handler(_plugin: any, ctx: ActionHandlerContext, options: IfActionHandlerConfig) {
+  const { server, input, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
+  const { condition, then, otherwise } = options;
+
+  const conditionResult = interpreteExpression(condition, ctx.vars);
+  const actions: RpdRouteActionConfig[] = conditionResult ? then : otherwise;
+  if (!actions || !actions.length) {
+    return;
+  }
+  await server.runActionHandlers(ctx, actions);
+}
+
+export default { code, handler } as IPluginActionHandler;

package/src/dataAccess/entityManager.ts

@@ -1871,13 +1871,13 @@ export default class EntityManager<TEntity = any> {
   async addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
     const server = this.#server;
     const model = this.getModel();
-    const { id, property, relations, routeContext } = options;
+    const { id: selfId, property, relations, routeContext } = options;
     const entity = await this.findById({
-      id,
+      id: selfId,
       routeContext,
     });
     if (!entity) {
-      throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
+      throw new Error(`${model.namespace}.${model.singularCode}  with id "${selfId}" was not found.`);
     }
 
     const relationProperty = getEntityPropertyByCode(server, model, property);
@@ -1901,9 +1901,20 @@ export default class EntityManager<TEntity = any> {
         FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
         WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName!)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName!)}=$2
       )`;
-        const params = [id, relation.id];
+
+        const targetId = relation[relationProperty.targetIdColumnName!] || relation.id;
+        const params = [selfId, targetId];
         await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
       }
+    } else {
+      const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+      for (const relation of relations) {
+        relation[relationProperty.selfIdColumnName!] = selfId;
+        await targetEntityManager.createEntity({
+          routeContext,
+          entity: relation,
+        });
+      }
     }
 
     await server.emitEvent({

package/src/dataAccess/entityMapper.ts

@@ -83,7 +83,7 @@ export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity
   }
 
   const propertyNames = Object.keys(entity);
-  propertyNames.forEach((propertyName) => {
+  for (const propertyName of propertyNames) {
     let columnName = propertyName;
     const property = getEntityPropertyByCode(server, model, propertyName);
     if (property) {
@@ -105,7 +105,7 @@ export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity
         }
       }
     }
-  });
+  }
 
   return result;
 }

package/src/server.ts

@@ -38,6 +38,7 @@ import { FacilityFactory } from "./core/facility";
 import { CronJobConfiguration } from "./types/cron-job-types";
 import coreRoutes from "./core/routes";
 import { interpreteConfigExpressions } from "./core/ExpressionInterpreter";
+import ifActionHandler from "./core/actionHandlers/ifActionHandler";
 
 export interface InitServerOptions {
   logger: Logger;
@@ -336,6 +337,10 @@ export class RapidServer implements IRpdServer {
 
   async start() {
     this.#logger.info("Starting rapid server...");
+
+    // register core action handlers
+    this.registerActionHandler(null, ifActionHandler);
+
     const pluginManager = this.#pluginManager;
     await pluginManager.loadPlugins(this.#plugins);
 
@@ -477,9 +482,10 @@ export class RapidServer implements IRpdServer {
   }
 
   async runActionHandlers(handlerContext: ActionHandlerContext, actions: RpdRouteActionConfig[]) {
-    if (!actions) {
+    if (!actions || !actions.length) {
       return;
     }
+
     for (const action of actions) {
       const actionCode = action.code;
       interpreteConfigExpressions(action.config, handlerContext.vars);
@@ -490,9 +496,7 @@ export class RapidServer implements IRpdServer {
       }
 
       await this.beforeRunActionHandler(handlerContext, action);
-
-      const result = await handler(handlerContext, action.config);
-      handlerContext.results.push(result);
+      await handler(handlerContext, action.config);
     }
   }
 

package/src/types.ts

@@ -844,14 +844,18 @@ export interface RemoveEntityRelationsOptions {
 }
 
 export type EntityWatcherType =
+  | EntityWatcher<"entity.beforeCreate">
   | EntityWatcher<"entity.create">
+  | EntityWatcher<"entity.beforeUpdate">
   | EntityWatcher<"entity.update">
+  | EntityWatcher<"entity.beforeDelete">
   | EntityWatcher<"entity.delete">
   | EntityWatcher<"entity.addRelations">
   | EntityWatcher<"entity.removeRelations">
+  | EntityWatcher<"entity.beforeResponse">
   | EntityWatcher<any>;
 
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes = any> {
+export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
   eventName: TEventName;
   modelSingularCode: string;
   handler: EntityWatchHandler<TEventName>;