@ruiapp/rapid-core 0.1.55 → 0.1.57

package/dist/dataAccess/entityManager.d.ts

@@ -6,11 +6,11 @@ export default class EntityManager<TEntity = any> {
     getModel(): RpdDataModel;
     findEntities(options: FindEntityOptions): Promise<TEntity[]>;
     findEntity(options: FindEntityOptions): Promise<TEntity | null>;
-    findById(options: FindEntityByIdOptions): Promise<TEntity | null>;
+    findById(options: FindEntityByIdOptions | string | number): Promise<TEntity | null>;
     createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity>;
     updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity>;
     count(options: CountEntityOptions): Promise<CountEntityResult>;
-    deleteById(options: DeleteEntityByIdOptions, plugin?: RapidPlugin): Promise<void>;
+    deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void>;
     addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
     removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
 }

package/dist/index.js

@@ -1999,10 +1999,10 @@ async function findEntities(server, dataAccessor, options) {
     }
     let propertiesToSlect;
     if (!options.properties || !options.properties.length) {
-        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => !isRelationProperty(property));
+        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => !isRelationProperty(property));
     }
     else {
-        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => options.properties.includes(property.code));
+        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => options.properties.includes(property.code));
     }
     const columnsToSelect = [];
     const relationPropertiesToSelect = [];
@@ -2044,7 +2044,7 @@ async function findEntities(server, dataAccessor, options) {
     });
     // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
     if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
-        const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter(property => property.relation === "one" && !property.linkTableName);
+        const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter((property) => property.relation === "one" && !property.linkTableName);
         oneRelationPropertiesWithNoLinkTable.forEach((property) => {
             if (property.targetIdColumnName) {
                 columnsToSelect.push({
@@ -2338,7 +2338,7 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                 operator: filter.operator,
                 field: {
                     name: columnName,
-                    tableName: (property && property.isBaseProperty) ? baseModel.tableName : model.tableName,
+                    tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
                 value: filter.value,
                 itemType: filter.itemType,
@@ -2604,6 +2604,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             modelSingularCode: model.singularCode,
             before: entity,
             changes: options.entityToSave,
+            operation: options.operation,
+            stateProperties: options.stateProperties,
         },
         sender: plugin,
         routeContext: options.routeContext,
@@ -2766,6 +2768,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             before: entity,
             after: updatedEntity,
             changes: changes,
+            operation: options.operation,
+            stateProperties: options.stateProperties,
         },
         sender: plugin,
         routeContext: options.routeContext,

package/dist/types.d.ts

@@ -84,6 +84,10 @@ export interface RpdEntityBeforeUpdateEventPayload {
     baseModelSingularCode?: string;
     before: any;
     changes: any;
+    operation?: {
+        type: string;
+    };
+    stateProperties?: string[];
 }
 export interface RpdEntityUpdateEventPayload {
     namespace: string;
@@ -92,6 +96,10 @@ export interface RpdEntityUpdateEventPayload {
     before: any;
     after: any;
     changes: any;
+    operation?: {
+        type: string;
+    };
+    stateProperties?: string[];
 }
 export interface RpdEntityBeforeDeleteEventPayload {
     namespace: string;
@@ -412,7 +420,9 @@ export interface UpdateEntityByIdOptions {
     routeContext?: RouteContext;
     id: any;
     entityToSave: any;
-    operation?: any;
+    operation?: {
+        type: string;
+    };
     stateProperties?: string[];
 }
 export interface DeleteEntityOptions {

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -68,9 +68,9 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 
   let propertiesToSlect: RpdDataModelProperty[];
   if (!options.properties || !options.properties.length) {
-    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => !isRelationProperty(property));
+    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => !isRelationProperty(property));
   } else {
-    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => options.properties.includes(property.code));
+    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => options.properties.includes(property.code));
   }
 
   const columnsToSelect: ColumnQueryOptions[] = [];
@@ -114,7 +114,7 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 
   // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
   if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
-    const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter(property => property.relation === "one" && !property.linkTableName);
+    const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter((property) => property.relation === "one" && !property.linkTableName);
     oneRelationPropertiesWithNoLinkTable.forEach((property) => {
       if (property.targetIdColumnName) {
         columnsToSelect.push({
@@ -429,7 +429,7 @@ async function convertEntityFiltersToRowFilters(server: IRpdServer, model: RpdDa
         operator: filter.operator,
         field: {
           name: columnName,
-          tableName: (property && property.isBaseProperty) ? baseModel.tableName : model.tableName,
+          tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
         value: (filter as any).value,
         itemType: (filter as any).itemType,
@@ -721,6 +721,8 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       modelSingularCode: model.singularCode,
       before: entity,
       changes: options.entityToSave,
+      operation: options.operation,
+      stateProperties: options.stateProperties,
     },
     sender: plugin,
     routeContext: options.routeContext,
@@ -789,7 +791,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       updatedEntityOneRelationProps[property.code] = targetEntity;
       targetRow[property.targetIdColumnName!] = targetEntityId;
     }
-  };
+  }
 
   let updatedRow = row;
   if (Object.keys(row).length) {
@@ -803,7 +805,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
   }
 
-  let updatedEntity = mapDbRowToEntity(server, model, {...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps}, true);
+  let updatedEntity = mapDbRowToEntity(server, model, { ...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps }, true);
   updatedEntity = Object.assign({}, entity, updatedEntity);
 
   // save many-relation properties
@@ -894,6 +896,8 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       before: entity,
       after: updatedEntity,
       changes: changes,
+      operation: options.operation,
+      stateProperties: options.stateProperties,
     },
     sender: plugin,
     routeContext: options.routeContext,
@@ -923,7 +927,7 @@ export default class EntityManager<TEntity = any> {
     return await findEntity(this.#server, this.#dataAccessor, options);
   }
 
-  async findById(options: FindEntityByIdOptions): Promise<TEntity | null> {
+  async findById(options: FindEntityByIdOptions | string | number): Promise<TEntity | null> {
     // options is id
     if (!isObject(options)) {
       options = {
@@ -951,11 +955,11 @@ export default class EntityManager<TEntity = any> {
     }
     const countRowOptions: CountRowOptions = {
       filters: await convertEntityFiltersToRowFilters(this.#server, model, baseModel, options.filters),
-    }
+    };
     return await this.#dataAccessor.count(countRowOptions);
   }
 
-  async deleteById(options: DeleteEntityByIdOptions, plugin?: RapidPlugin): Promise<void> {
+  async deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void> {
     // options is id
     if (!isObject(options)) {
       options = {

package/src/types.ts

@@ -99,6 +99,10 @@ export interface RpdEntityBeforeUpdateEventPayload {
   baseModelSingularCode?: string;
   before: any;
   changes: any;
+  operation?: {
+    type: string;
+  };
+  stateProperties?: string[];
 }
 
 export interface RpdEntityUpdateEventPayload {
@@ -108,6 +112,10 @@ export interface RpdEntityUpdateEventPayload {
   before: any;
   after: any;
   changes: any;
+  operation?: {
+    type: string;
+  };
+  stateProperties?: string[];
 }
 
 export interface RpdEntityBeforeDeleteEventPayload {
@@ -481,7 +489,9 @@ export interface UpdateEntityByIdOptions {
   routeContext?: RouteContext;
   id: any;
   entityToSave: any;
-  operation?: any;
+  operation?: {
+    type: string;
+  };
   stateProperties?: string[];
 }