@ruiapp/rapid-core 0.1.22 → 0.1.24

package/dist/core/server.d.ts

@@ -23,7 +23,7 @@ export interface IRpdServer {
     appendModelProperties(modelSingularCode: string, properties: RpdDataModelProperty[]): any;
     getModel(options: GetModelOptions): RpdDataModel | undefined;
     registerEventHandler<K extends keyof RpdServerEventTypes>(eventName: K, listener: (...args: RpdServerEventTypes[K]) => void): this;
-    emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, sender: RapidPlugin, payload: RpdServerEventTypes[K][1]): void;
+    emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, payload: RpdServerEventTypes[K][1], sender?: RapidPlugin): void;
     handleRequest(request: Request, next: Next): Promise<Response>;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
 }

package/dist/dataAccess/entityManager.d.ts

@@ -7,10 +7,10 @@ export default class EntityManager<TEntity = any> {
     findEntities(options: FindEntityOptions): Promise<TEntity[]>;
     findEntity(options: FindEntityOptions): Promise<TEntity | null>;
     findById(id: any, keepNonPropertyFields?: boolean): Promise<TEntity | null>;
-    createEntity(options: CreateEntityOptions, plugin: RapidPlugin): Promise<TEntity>;
-    updateEntityById(options: UpdateEntityByIdOptions, plugin: RapidPlugin): Promise<TEntity>;
+    createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity>;
+    updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity>;
     count(options: CountEntityOptions): Promise<CountEntityResult>;
-    deleteById(id: any, plugin: RapidPlugin): Promise<void>;
-    addRelations(options: AddEntityRelationsOptions, plugin: RapidPlugin): Promise<void>;
-    removeRelations(options: RemoveEntityRelationsOptions, plugin: RapidPlugin): Promise<void>;
+    deleteById(id: any, plugin?: RapidPlugin): Promise<void>;
+    addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
+    removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
 }

package/dist/index.js

@@ -1041,7 +1041,7 @@ class RapidRequest {
         const requestMethod = this.method;
         if (requestMethod === "POST" || requestMethod === "PUT" || requestMethod === "PATCH") {
             const req = this.#raw;
-            const contentType = this.#headers.get("Content-Type");
+            const contentType = this.#headers.get("Content-Type") || "application/json";
             if (contentType.includes("json")) {
                 this.#body = {
                     type: "json",
@@ -2171,7 +2171,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (Object.keys(row).length) {
         updatedRow = await dataAccessor.updateById(id, row);
     }
-    const updatedEntity = Object.assign({}, entity, updatedRow);
+    let updatedEntity = mapDbRowToEntity(model, updatedRow, false);
+    updatedEntity = Object.assign({}, entity, updatedEntity);
     // save many-relation properties
     for (const property of manyRelationPropertiesToUpdate) {
         const relatedEntities = [];
@@ -2245,13 +2246,13 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         }
         updatedEntity[property.code] = relatedEntities;
     }
-    server.emitEvent("entity.update", plugin, {
+    server.emitEvent("entity.update", {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         before: entity,
         after: updatedEntity,
         changes: changes,
-    });
+    }, plugin);
     return updatedEntity;
 }
 class EntityManager {
@@ -2276,11 +2277,11 @@ class EntityManager {
     async createEntity(options, plugin) {
         const model = this.getModel();
         const newEntity = await createEntity(this.#server, this.#dataAccessor, options);
-        this.#server.emitEvent("entity.create", plugin, {
+        this.#server.emitEvent("entity.create", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             after: newEntity,
-        });
+        }, plugin);
         return newEntity;
     }
     async updateEntityById(options, plugin) {
@@ -2296,11 +2297,11 @@ class EntityManager {
             return;
         }
         await this.#dataAccessor.deleteById(id);
-        this.#server.emitEvent("entity.delete", plugin, {
+        this.#server.emitEvent("entity.delete", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             before: entity,
-        });
+        }, plugin);
     }
     async addRelations(options, plugin) {
         const model = this.getModel();
@@ -2330,13 +2331,13 @@ class EntityManager {
                 await server.queryDatabaseObject(command, params);
             }
         }
-        server.emitEvent("entity.addRelations", plugin, {
+        server.emitEvent("entity.addRelations", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             entity,
             property,
             relations,
-        });
+        }, plugin);
     }
     async removeRelations(options, plugin) {
         const model = this.getModel();
@@ -2362,13 +2363,13 @@ class EntityManager {
                 await server.queryDatabaseObject(command, params);
             }
         }
-        server.emitEvent("entity.removeRelations", plugin, {
+        server.emitEvent("entity.removeRelations", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             entity,
             property,
             relations,
-        });
+        }, plugin);
     }
 }
 
@@ -2519,7 +2520,7 @@ class RapidServer {
         this.#eventManager.on(eventName, listener);
         return this;
     }
-    async emitEvent(eventName, sender, payload) {
+    async emitEvent(eventName, payload, sender) {
         this.#logger.debug(`Emitting '${eventName}' event.`, { eventName, payload });
         await this.#eventManager.emit(eventName, sender, payload);
         // TODO: should move this logic into metaManager
@@ -2559,10 +2560,15 @@ class RapidServer {
     registerFacilityFactory(factory) {
         this.#facilityFactories.set(factory.name, factory);
     }
-    async getFacility(name, options) {
+    async getFacility(name, options, nullIfUnknownFacility) {
         const factory = this.#facilityFactories.get(name);
         if (!factory) {
-            throw new Error(`Failed to get facility. Unknown facility name: ${name}`);
+            if (nullIfUnknownFacility) {
+                return null;
+            }
+            else {
+                throw new Error(`Failed to get facility. Unknown facility name: ${name}`);
+            }
         }
         return await factory.createFacility(this, options);
     }

package/dist/server.d.ts

@@ -31,11 +31,11 @@ export declare class RapidServer implements IRpdServer {
     getModel(options: GetModelOptions): RpdDataModel | undefined;
     getEntityManager<TEntity = any>(singularCode: string): EntityManager<TEntity>;
     registerEventHandler<K extends keyof RpdServerEventTypes>(eventName: K, listener: (...args: RpdServerEventTypes[K]) => void): this;
-    emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, sender: RapidPlugin, payload: RpdServerEventTypes[K][1]): Promise<void>;
+    emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, payload: RpdServerEventTypes[K][1], sender?: RapidPlugin): Promise<void>;
     start(): Promise<void>;
     configureApplication(): Promise<void>;
     registerFacilityFactory(factory: FacilityFactory): void;
-    getFacility<TFacility = any>(name: string, options?: any): Promise<TFacility>;
+    getFacility<TFacility = any>(name: string, options?: any, nullIfUnknownFacility?: boolean): Promise<TFacility>;
     queryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     tryQueryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     get middlewares(): any[];

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [],
   "author": "Fossil",
   "license": "MIT",

package/src/core/request.ts

@@ -38,7 +38,7 @@ export class RapidRequest {
     const requestMethod = this.method;
     if (requestMethod === "POST" || requestMethod === "PUT" || requestMethod === "PATCH") {
       const req = this.#raw;
-      const contentType = this.#headers.get("Content-Type");
+      const contentType = this.#headers.get("Content-Type") || "application/json";
       if (contentType.includes("json")) {
         this.#body = {
           type: "json",

package/src/core/server.ts

@@ -43,8 +43,8 @@ export interface IRpdServer {
   ): this;
   emitEvent<K extends keyof RpdServerEventTypes>(
     eventName: K,
-    sender: RapidPlugin,
     payload: RpdServerEventTypes[K][1],
+    sender?: RapidPlugin,
   ): void;
   handleRequest(request: Request, next: Next): Promise<Response>;
   beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;

package/src/dataAccess/entityManager.ts

@@ -553,7 +553,7 @@ async function updateEntityById(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: UpdateEntityByIdOptions,
-  plugin: RapidPlugin
+  plugin?: RapidPlugin
 ) {
   const model = dataAccessor.getModel();
   const { id, entityToSave } = options;
@@ -602,7 +602,8 @@ async function updateEntityById(
   if (Object.keys(row).length) {
     updatedRow = await dataAccessor.updateById(id, row);
   }
-  const updatedEntity = Object.assign({}, entity, updatedRow);
+  let updatedEntity = mapDbRowToEntity(model, updatedRow, false);
+  updatedEntity = Object.assign({}, entity, updatedEntity);
 
   // save many-relation properties
   for (const property of manyRelationPropertiesToUpdate) {
@@ -685,7 +686,6 @@ async function updateEntityById(
   
   server.emitEvent(
     "entity.update",
-    plugin,
     {
       namespace: model.namespace,
       modelSingularCode: model.singularCode,
@@ -693,6 +693,7 @@ async function updateEntityById(
       after: updatedEntity,
       changes: changes,
     },
+    plugin,
   );
   return updatedEntity;
 }
@@ -722,24 +723,24 @@ export default class EntityManager<TEntity=any> {
     return await findById(this.#server, this.#dataAccessor, id, keepNonPropertyFields);
   }
 
-  async createEntity(options: CreateEntityOptions, plugin: RapidPlugin): Promise<TEntity> {
+  async createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity> {
     const model = this.getModel();
     const newEntity = await createEntity(this.#server, this.#dataAccessor, options);
 
     this.#server.emitEvent(
       "entity.create",
-      plugin,
       {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         after: newEntity,
       },
+      plugin,
     );
 
     return newEntity;
   }
 
-  async updateEntityById(options: UpdateEntityByIdOptions, plugin: RapidPlugin): Promise<TEntity> {
+  async updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity> {
     return await updateEntityById(this.#server, this.#dataAccessor, options, plugin);
   }
 
@@ -747,7 +748,7 @@ export default class EntityManager<TEntity=any> {
     return await this.#dataAccessor.count(options);
   }
 
-  async deleteById(id: any, plugin: RapidPlugin): Promise<void> {
+  async deleteById(id: any, plugin?: RapidPlugin): Promise<void> {
     const model = this.getModel();
     const entity = await this.findById(id, true);
     if (!entity) {
@@ -757,16 +758,16 @@ export default class EntityManager<TEntity=any> {
     await this.#dataAccessor.deleteById(id);
     this.#server.emitEvent(
       "entity.delete",
-      plugin,
       {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         before: entity,
       },
+      plugin,
     );
   }
 
-  async addRelations(options: AddEntityRelationsOptions, plugin: RapidPlugin): Promise<void> {
+  async addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
     const model = this.getModel();
     const {id, property, relations} = options;
     const entity = await this.findById(id);
@@ -800,7 +801,6 @@ export default class EntityManager<TEntity=any> {
 
     server.emitEvent(
       "entity.addRelations",
-      plugin,
       {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
@@ -808,10 +808,11 @@ export default class EntityManager<TEntity=any> {
         property,
         relations,
       },
+      plugin,
     );
   }
 
-  async removeRelations(options: RemoveEntityRelationsOptions, plugin: RapidPlugin): Promise<void> {
+  async removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
     const model = this.getModel();
     const {id, property, relations} = options;
     const entity = await this.findById(id);
@@ -841,7 +842,6 @@ export default class EntityManager<TEntity=any> {
 
     server.emitEvent(
       "entity.removeRelations",
-      plugin,
       {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
@@ -849,6 +849,7 @@ export default class EntityManager<TEntity=any> {
         property,
         relations,
       },
+      plugin,
     );
   }
 }

package/src/server.ts

@@ -215,8 +215,8 @@ export class RapidServer implements IRpdServer {
 
   async emitEvent<K extends keyof RpdServerEventTypes>(
     eventName: K,
-    sender: RapidPlugin,
     payload: RpdServerEventTypes[K][1],
+    sender?: RapidPlugin,
   ) {
     this.#logger.debug(`Emitting '${eventName}' event.`, { eventName, payload });
     await this.#eventManager.emit<K>(eventName, sender, payload as any);
@@ -272,10 +272,14 @@ export class RapidServer implements IRpdServer {
     this.#facilityFactories.set(factory.name, factory);
   }
 
-  async getFacility<TFacility=any>(name: string, options?: any): Promise<TFacility> {
+  async getFacility<TFacility=any>(name: string, options?: any, nullIfUnknownFacility?: boolean): Promise<TFacility> {
     const factory = this.#facilityFactories.get(name);
     if (!factory) {
-      throw new Error(`Failed to get facility. Unknown facility name: ${name}`);
+      if (nullIfUnknownFacility) {
+        return null;
+      } else {
+        throw new Error(`Failed to get facility. Unknown facility name: ${name}`);
+      }
     }
 
     return await factory.createFacility(this, options);