@domain.js/main 0.3.4 → 0.3.5

package/dist/deps/rest/index.d.ts

@@ -27,11 +27,17 @@ export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Util
     modify: <T extends ModelBase<any, any>>(Model: ModelStatic<T>, model: T, params: Record<string, any>, isAdmin?: boolean, _cols?: string[] | undefined) => Promise<T>;
     add: <T_1 extends ModelBase<any, any>>(Model: ModelStatic<T_1>, params: Record<string, any>, isAdmin: boolean | undefined, _cols: string[] | undefined, { creatorId, clientIp }: CreatorAndClientIp) => Promise<T_1>;
     remove: (model: Sequelize.Model, deletorId: UserId) => Promise<void | Sequelize.Model<any, any>>;
-    list: <T_2 extends ModelBase<any, any>>(Model: ModelStatic<T_2>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: boolean | undefined) => Promise<{
-        count: number;
-        rows: T_2[];
-    }>;
-    stats: <T_3 extends ModelBase<any, any>>(Model: ModelStatic<T_3>, params: Record<string, any>, where?: any, conf?: {
+    list: {
+        <T_2 extends ModelBase<any, any>, J = ReturnType<T_2["toJSON"]>>(Model: ModelStatic<T_2>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: false | undefined): Promise<{
+            rows: T_2[];
+            count: number;
+        }>;
+        <T_3 extends ModelBase<any, any>, J_1 = ReturnType<T_3["toJSON"]>>(Model: ModelStatic<T_3>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: true | undefined): Promise<{
+            rows: J_1[];
+            count: number;
+        }>;
+    };
+    stats: <T_4 extends ModelBase<any, any>>(Model: ModelStatic<T_4>, params: Record<string, any>, where?: any, conf?: {
         dimensions?: Record<string, string> | undefined;
         metrics: Record<string, string>;
         pagination?: {

package/dist/deps/rest/index.js

@@ -99,15 +99,7 @@ function Main(cnf, deps, utils) {
     };
     // count条件所需属性
     const COUNT_OPT = Object.freeze(["where", "include"]);
-    /**
-     * Restful list (R of CRUD) for list resource
-     * @param Model Model definition of resources
-     * @param params parameters for updating
-     * @param allowAttrs Allow columns to be returned
-     * @param toJSON Whether to directly return JSON formatted objects
-     * @returns findAll resource result, object propoties has count, rows
-     */
-    const list = async (Model, params, allowAttrs, toJSON) => {
+    async function list(Model, params, allowAttrs, toJSON) {
         const opt = findAllOpts(Model, params);
         const { _ignoreTotal } = params;
         // 提高查询速度
@@ -117,13 +109,10 @@ function Main(cnf, deps, utils) {
         if (Array.isArray(allowAttrs) && allowAttrs.length)
             opt.attributes = allowAttrs;
         const rows = await Model.findAll(opt);
-        if (toJSON) {
-            for (let i = 0; i < rows.length; i += 1) {
-                rows[i] = rows[i].toJSON();
-            }
-        }
-        return { count, rows };
-    };
+        if (!toJSON)
+            return { rows, count };
+        return { count, rows: rows.map((x) => x.toJSON()) };
+    }
     return { modify, add, remove, list, stats: (0, stats_1.Stats)(cnf, deps, utils) };
 }
 exports.Main = Main;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {