@ruiapp/rapid-core 0.1.14 → 0.1.16

package/dist/dataAccess/entityManager.d.ts

@@ -6,7 +6,7 @@ export default class EntityManager<TEntity = any> {
     getModel(): RpdDataModel;
     findEntities(options: FindEntityOptions): Promise<TEntity[]>;
     findEntity(options: FindEntityOptions): Promise<TEntity | null>;
-    findById(id: any): 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>;
     count(options: CountEntityOptions): Promise<CountEntityResult>;

package/dist/dataAccess/entityMapper.d.ts

@@ -1,3 +1,3 @@
 import { RpdDataModel } from "../types";
-export declare function mapDbRowToEntity(model: RpdDataModel, row: any): any;
+export declare function mapDbRowToEntity(model: RpdDataModel, row: any, keepNonPropertyFields: boolean): any;
 export declare function mapEntityToDbRow(model: RpdDataModel, entity: any): any;

package/dist/index.js

@@ -1616,7 +1616,7 @@ function isRelationProperty(property) {
 }
 
 // TODO Generate mapper and cache it.
-function mapDbRowToEntity(model, row) {
+function mapDbRowToEntity(model, row, keepNonPropertyFields) {
     if (!row) {
         return null;
     }
@@ -1638,6 +1638,9 @@ function mapDbRowToEntity(model, row) {
                 isRelationProp = true;
                 propertyName = property.code;
             }
+            else if (keepNonPropertyFields) {
+                propertyName = columnName;
+            }
         }
         if (isRelationProp) {
             if (row[propertyName] && !result[propertyName]) {
@@ -1775,7 +1778,7 @@ async function findEntities(server, dataAccessor, options) {
                     ___namespace.forEach(entities, (entity) => {
                         entity[relationProperty.code] = ___namespace.filter(relationLinks, (link) => {
                             return link[relationProperty.selfIdColumnName] == entity["id"];
-                        }).map(link => mapDbRowToEntity(targetModel, link.targetEntity));
+                        }).map(link => mapDbRowToEntity(targetModel, link.targetEntity, false));
                     });
                 }
             }
@@ -1795,24 +1798,36 @@ async function findEntities(server, dataAccessor, options) {
                     if (isManyRelation) {
                         entity[relationProperty.code] = ___namespace.filter(relatedEntities, (relatedEntity) => {
                             return relatedEntity[relationProperty.selfIdColumnName] == entity.id;
-                        }).map(item => mapDbRowToEntity(targetModel, item));
+                        }).map(item => mapDbRowToEntity(targetModel, item, false));
                     }
                     else {
                         entity[relationProperty.code] = mapDbRowToEntity(targetModel, ___namespace.find(relatedEntities, (relatedEntity) => {
                             // TODO: id property code should be configurable.
                             return relatedEntity["id"] == entity[relationProperty.targetIdColumnName];
-                        }));
+                        }), false);
                     }
                 });
             }
         }
     }
-    return entities.map(item => mapDbRowToEntity(model, item));
+    return entities.map(item => mapDbRowToEntity(model, item, options.keepNonPropertyFields));
 }
 async function findEntity(server, dataAccessor, options) {
     const entities = await findEntities(server, dataAccessor, options);
     return ___namespace.first(entities);
 }
+async function findById(server, dataAccessor, id, keepNonPropertyFields = false) {
+    return await findEntity(server, dataAccessor, {
+        filters: [
+            {
+                operator: "eq",
+                field: "id",
+                value: id,
+            }
+        ],
+        keepNonPropertyFields,
+    });
+}
 async function replaceFiltersWithFiltersOperator(server, model, filters) {
     if (!filters || !filters.length) {
         return [];
@@ -2031,7 +2046,7 @@ async function createEntity(server, dataAccessor, options) {
         }
     }
     const newRow = await dataAccessor.create(row);
-    const newEntity = mapDbRowToEntity(model, newRow);
+    const newEntity = mapDbRowToEntity(model, newRow, false);
     // save many-relation properties
     for (const property of manyRelationPropertiesToCreate) {
         newEntity[property.code] = [];
@@ -2108,7 +2123,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (!id) {
         throw new Error("Id is required when updating an entity.");
     }
-    const entity = await this.findById(id);
+    const entity = await findById(server, dataAccessor, id);
     if (!entity) {
         throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
     }
@@ -2246,16 +2261,8 @@ class EntityManager {
     async findEntity(options) {
         return await findEntity(this.#server, this.#dataAccessor, options);
     }
-    async findById(id) {
-        return await this.findEntity({
-            filters: [
-                {
-                    operator: "eq",
-                    field: "id",
-                    value: id,
-                }
-            ]
-        });
+    async findById(id, keepNonPropertyFields = false) {
+        return await findById(this.#server, this.#dataAccessor, id);
     }
     async createEntity(options, plugin) {
         const model = this.getModel();
@@ -2275,7 +2282,7 @@ class EntityManager {
     }
     async deleteById(id, plugin) {
         const model = this.getModel();
-        const entity = await this.findById(id);
+        const entity = await this.findById(id, true);
         if (!entity) {
             return;
         }
@@ -3228,6 +3235,7 @@ async function handler$b(plugin, ctx, options) {
     const entityManager = server.getEntityManager(options.singularCode);
     await entityManager.deleteById(input.id, plugin);
     ctx.status = 200;
+    ctx.output = {};
 }
 
 var deleteCollectionEntityById = /*#__PURE__*/Object.freeze({

package/dist/types.d.ts

@@ -272,6 +272,7 @@ export interface FindEntityOptions {
     orderBy?: FindEntityOrderByOptions[];
     pagination?: FindEntityPaginationOptions;
     properties?: string[] | Record<string, any>;
+    keepNonPropertyFields?: boolean;
 }
 export interface FindEntityRelationalFilterOptions {
     field: string;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -107,7 +107,7 @@ async function findEntities(
           _.forEach(entities, (entity: any) => {
             entity[relationProperty.code] = _.filter(relationLinks, (link: any) => {
               return link[relationProperty.selfIdColumnName!] == entity["id"];
-            }).map(link => mapDbRowToEntity(targetModel, link.targetEntity));
+            }).map(link => mapDbRowToEntity(targetModel, link.targetEntity, false));
           });
         }
       } else {
@@ -147,7 +147,7 @@ async function findEntities(
               (relatedEntity: any) => {
                 return relatedEntity[relationProperty.selfIdColumnName!] == entity.id;
               },
-            ).map(item => mapDbRowToEntity(targetModel!, item));
+            ).map(item => mapDbRowToEntity(targetModel!, item, false));
           } else {
             entity[relationProperty.code] = mapDbRowToEntity(targetModel!, _.find(
               relatedEntities,
@@ -155,13 +155,13 @@ async function findEntities(
                 // TODO: id property code should be configurable.
                 return relatedEntity["id"] == entity[relationProperty.targetIdColumnName!];
               },
-            ));
+            ), false);
           }
         });
       }
     }
   }
-  return entities.map(item => mapDbRowToEntity(model, item));
+  return entities.map(item => mapDbRowToEntity(model, item, options.keepNonPropertyFields));
 }
 
 async function findEntity(
@@ -173,6 +173,24 @@ async function findEntity(
   return _.first(entities);
 }
 
+async function findById(
+  server: IRpdServer,
+  dataAccessor: IRpdDataAccessor,
+  id: any,
+  keepNonPropertyFields: boolean = false
+): Promise<any> {
+  return await findEntity(server, dataAccessor, {
+    filters: [
+      {
+        operator: "eq",
+        field: "id",
+        value: id,
+      }
+    ],
+    keepNonPropertyFields,
+  });
+}
+
 async function replaceFiltersWithFiltersOperator(
   server: IRpdServer,
   model: RpdDataModel,
@@ -452,8 +470,7 @@ async function createEntity(
   }
 
   const newRow = await dataAccessor.create(row);
-  const newEntity = mapDbRowToEntity(model, newRow);
-
+  const newEntity = mapDbRowToEntity(model, newRow, false);
 
   // save many-relation properties
   for (const property of manyRelationPropertiesToCreate) {
@@ -544,7 +561,7 @@ async function updateEntityById(
     throw new Error("Id is required when updating an entity.")
   }
 
-  const entity = await this.findById(id);
+  const entity = await findById(server, dataAccessor, id);
   if (!entity) {
     throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
   }
@@ -701,16 +718,8 @@ export default class EntityManager<TEntity=any> {
     return await findEntity(this.#server, this.#dataAccessor, options);
   }
 
-  async findById(id: any): Promise<TEntity | null> {
-    return await this.findEntity({
-      filters: [
-        {
-          operator: "eq",
-          field: "id",
-          value: id,
-        }
-      ]
-    });
+  async findById(id: any, keepNonPropertyFields: boolean = false): Promise<TEntity | null> {
+    return await findById(this.#server, this.#dataAccessor, id);
   }
 
   async createEntity(options: CreateEntityOptions, plugin: RapidPlugin): Promise<TEntity> {
@@ -740,7 +749,7 @@ export default class EntityManager<TEntity=any> {
 
   async deleteById(id: any, plugin: RapidPlugin): Promise<void> {
     const model = this.getModel();
-    const entity = await this.findById(id);
+    const entity = await this.findById(id, true);
     if (!entity) {
       return;
     }

package/src/dataAccess/entityMapper.ts

@@ -3,7 +3,7 @@ import { isRelationProperty } from "~/utilities/rapidUtility";
 
 // TODO Generate mapper and cache it.
 
-export function mapDbRowToEntity(model: RpdDataModel, row: any) {
+export function mapDbRowToEntity(model: RpdDataModel, row: any, keepNonPropertyFields: boolean) {
   if (!row) {
     return null;
   }
@@ -25,6 +25,8 @@ export function mapDbRowToEntity(model: RpdDataModel, row: any) {
       if (property) {
         isRelationProp = true;
         propertyName = property.code;
+      } else if (keepNonPropertyFields) {
+        propertyName = columnName;
       }
     }
 

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

@@ -1,5 +1,4 @@
 import { RunEntityActionHandlerOptions } from "~/types";
-import { mapDbRowToEntity } from "~/dataAccess/entityMapper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
@@ -17,4 +16,5 @@ export async function handler(
   await entityManager.deleteById(input.id, plugin);
 
   ctx.status = 200;
+  ctx.output = {};
 }

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

@@ -1,7 +1,5 @@
 import { RunEntityActionHandlerOptions } from "~/types";
-import { getEntityPartChanges } from "~/helpers/entityHelpers";
 import { mergeInput } from "~/helpers/inputHelper";
-import { mapDbRowToEntity } from "~/dataAccess/entityMapper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 

package/src/types.ts

@@ -370,6 +370,7 @@ export interface FindEntityOptions {
   orderBy?: FindEntityOrderByOptions[];
   pagination?: FindEntityPaginationOptions;
   properties?: string[] | Record<string, any>;
+  keepNonPropertyFields?: boolean;
 }
 
 export interface FindEntityRelationalFilterOptions {