@ruiapp/rapid-core 0.1.17 → 0.1.19

package/dist/index.js

@@ -1643,8 +1643,13 @@ function mapDbRowToEntity(model, row, keepNonPropertyFields) {
             }
         }
         if (isRelationProp) {
-            if (row[propertyName] && !result[propertyName]) {
-                result[propertyName] = row[propertyName];
+            if (row[propertyName]) {
+                if (!result[propertyName]) {
+                    result[propertyName] = row[propertyName];
+                }
+            }
+            else if (keepNonPropertyFields) {
+                result[columnName] = row[columnName];
             }
         }
         else {

package/dist/plugins/entityWatch/EntityWatchPluginTypes.d.ts

@@ -1,6 +1,7 @@
 import { IRpdServer } from "../../core/server";
 import { RpdServerEventTypes } from "../../types";
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
+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> {
     eventName: TEventName;
     modelSingularCode: string;
     handler: EntityWatchHandler<TEventName>;
@@ -11,5 +12,5 @@ export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTyp
     payload: RpdServerEventTypes[TEventName][1];
 };
 export interface EntityWatchPluginInitOptions {
-    watchers: EntityWatcher<keyof RpdServerEventTypes>[];
+    watchers: EntityWatcherType[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],

package/src/dataAccess/entityMapper.ts

@@ -31,8 +31,12 @@ export function mapDbRowToEntity(model: RpdDataModel, row: any, keepNonPropertyF
     }
 
     if (isRelationProp) {
-      if (row[propertyName] && !result[propertyName]) {
-        result[propertyName] = row[propertyName];
+      if (row[propertyName]) {
+        if (!result[propertyName]) {
+          result[propertyName] = row[propertyName];
+        }
+      } else if (keepNonPropertyFields) {
+        result[columnName] = row[columnName];
       }
     } else {
       if (!result[propertyName]) {

package/src/plugins/entityWatch/EntityWatchPlugin.ts

@@ -1,7 +1,6 @@
 import type { RpdEntityCreateEventPayload, RpdServerEventTypes } from "~/types";
-
 import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
-import { EntityWatchHandlerContext, EntityWatchPluginInitOptions, EntityWatcher } from "./EntityWatchPluginTypes";
+import { EntityWatchHandlerContext, EntityWatchPluginInitOptions } from "./EntityWatchPluginTypes";
 import EventManager from "~/core/eventManager";
 
 class EntityWatchPlugin implements RapidPlugin {

package/src/plugins/entityWatch/EntityWatchPluginTypes.ts

@@ -1,7 +1,16 @@
 import { IRpdServer } from "~/core/server";
 import { RpdServerEventTypes } from "~/types";
 
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
+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> {
   eventName: TEventName;
   modelSingularCode: string;
   handler: EntityWatchHandler<TEventName>;
@@ -15,5 +24,5 @@ export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTyp
 }
 
 export interface EntityWatchPluginInitOptions {
-  watchers: EntityWatcher<keyof RpdServerEventTypes>[];
+  watchers: EntityWatcherType[];
 }