@ruiapp/rapid-core 0.2.7 → 0.2.8

package/dist/dataAccess/dataAccessor.d.ts

@@ -17,6 +17,6 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     find(options: FindRowOptions): Promise<T[]>;
     findOne(options: FindRowOptions): Promise<T>;
     findById(id: any): Promise<T | null>;
-    count(options: CountRowOptions): Promise<any>;
+    count(options: CountRowOptions): Promise<number>;
     deleteById(id: any): Promise<void>;
 }

package/dist/dataAccess/entityManager.d.ts

@@ -1,4 +1,4 @@
-import { AddEntityRelationsOptions, CountEntityOptions, CountEntityResult, CreateEntityOptions, DeleteEntityByIdOptions, FindEntityByIdOptions, FindEntityOptions, IRpdDataAccessor, RemoveEntityRelationsOptions, RpdDataModel, RpdDataModelIndex, RpdDataModelProperty, UpdateEntityByIdOptions, FindEntityFindOneRelationEntitiesOptions, FindEntityFindManyRelationEntitiesOptions } from "../types";
+import { AddEntityRelationsOptions, CountEntityOptions, CreateEntityOptions, DeleteEntityByIdOptions, FindEntityByIdOptions, FindEntityOptions, IRpdDataAccessor, RemoveEntityRelationsOptions, RpdDataModel, RpdDataModelIndex, RpdDataModelProperty, UpdateEntityByIdOptions, FindEntityFindOneRelationEntitiesOptions, FindEntityFindManyRelationEntitiesOptions } from "../types";
 import { IRpdServer, RapidPlugin } from "../core/server";
 import { RouteContext } from "../core/routeContext";
 export type FindOneRelationEntitiesOptions = {
@@ -30,7 +30,7 @@ export default class EntityManager<TEntity = any> {
     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>;
+    count(options: CountEntityOptions): Promise<number>;
     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

@@ -159,11 +159,9 @@ class DataAccessor {
         const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
         const row = lodash.first(result);
         if (row) {
-            return row;
+            return row.count;
         }
-        return {
-            count: 0,
-        };
+        return 0;
     }
     async deleteById(id) {
         const options = {
@@ -4790,8 +4788,8 @@ async function handler$q(plugin, ctx, options) {
         const result = { list: entities };
         if (input.pagination && !input.pagination.withoutTotal) {
             // TOOD: count entities when calling findEntities for performance.
-            const countResult = await entityManager.count(input);
-            result.total = countResult.count;
+            const total = await entityManager.count(input);
+            result.total = total;
         }
         return result;
     });
@@ -4827,10 +4825,11 @@ var findCollectionEntityById = /*#__PURE__*/Object.freeze({
 
 const code$o = "countCollectionEntities";
 async function handler$o(plugin, ctx, options) {
-    await runCollectionEntityActionHandler(ctx, options, code$o, (entityManager, input) => {
+    await runCollectionEntityActionHandler(ctx, options, code$o, async (entityManager, input) => {
         input.filters = removeFiltersWithNullValue(input.filters);
         input.routeContext = ctx.routerContext;
-        return entityManager.count(input);
+        const count = await entityManager.count(input);
+        return { count };
     });
 }
 

package/dist/types.d.ts

@@ -377,7 +377,7 @@ export interface IRpdDataAccessor<T = any> {
     find(options: FindRowOptions): Promise<T[]>;
     findOne(options: FindRowOptions): Promise<T | null>;
     findById(id: any): Promise<T | null>;
-    count(options: CountRowOptions): Promise<any>;
+    count(options: CountRowOptions): Promise<number>;
     deleteById(id: any): Promise<void>;
 }
 export type EntityFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";

package/package.json

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

package/src/dataAccess/dataAccessor.ts

@@ -98,7 +98,7 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     return result;
   }
 
-  async count(options: CountRowOptions): Promise<any> {
+  async count(options: CountRowOptions): Promise<number> {
     let query: DatabaseQuery;
     if (this.#model.base) {
       const baseModel = this.#server.getModel({
@@ -112,11 +112,9 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
 
     const row = first(result);
     if (row) {
-      return row;
+      return row.count;
     }
-    return {
-      count: 0,
-    };
+    return 0;
   }
 
   async deleteById(id: any) {

package/src/dataAccess/entityManager.ts

@@ -1,7 +1,6 @@
 import {
   AddEntityRelationsOptions,
   CountEntityOptions,
-  CountEntityResult,
   CreateEntityOptions,
   DeleteEntityByIdOptions,
   EntityFilterOperators,
@@ -1459,7 +1458,7 @@ export default class EntityManager<TEntity = any> {
     return await updateEntityById(this.#server, this.#dataAccessor, options, plugin);
   }
 
-  async count(options: CountEntityOptions): Promise<CountEntityResult> {
+  async count(options: CountEntityOptions): Promise<number> {
     const model = this.#dataAccessor.getModel();
     let baseModel: RpdDataModel;
     if (model.base) {

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

@@ -1,4 +1,4 @@
-import { CountEntityOptions, RunEntityActionHandlerOptions } from "~/types";
+import { CountEntityOptions, CountEntityResult, RunEntityActionHandlerOptions } from "~/types";
 import runCollectionEntityActionHandler from "~/helpers/runCollectionEntityActionHandler";
 import { removeFiltersWithNullValue } from "~/helpers/filterHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
@@ -7,9 +7,10 @@ import { RapidPlugin } from "~/core/server";
 export const code = "countCollectionEntities";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions) {
-  await runCollectionEntityActionHandler(ctx, options, code, (entityManager, input: CountEntityOptions) => {
+  await runCollectionEntityActionHandler(ctx, options, code, async (entityManager, input: CountEntityOptions): Promise<CountEntityResult> => {
     input.filters = removeFiltersWithNullValue(input.filters);
     input.routeContext = ctx.routerContext;
-    return entityManager.count(input);
+    const count = await entityManager.count(input);
+    return { count };
   });
 }

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

@@ -18,8 +18,8 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
 
     if (input.pagination && !input.pagination.withoutTotal) {
       // TOOD: count entities when calling findEntities for performance.
-      const countResult = await entityManager.count(input);
-      result.total = countResult.count;
+      const total = await entityManager.count(input);
+      result.total = total;
     }
     return result;
   });

package/src/types.ts

@@ -456,7 +456,7 @@ export interface IRpdDataAccessor<T = any> {
   find(options: FindRowOptions): Promise<T[]>;
   findOne(options: FindRowOptions): Promise<T | null>;
   findById(id: any): Promise<T | null>;
-  count(options: CountRowOptions): Promise<any>;
+  count(options: CountRowOptions): Promise<number>;
   deleteById(id: any): Promise<void>;
 }