@domain.js/main 0.1.12 → 0.1.16

package/dist/cfg/index.js

@@ -1,9 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const _ = require("lodash");
-const ajv_1 = require("ajv");
-const ajv_formats_1 = require("ajv-formats");
+const _ = __importStar(require("lodash"));
+const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
 function Main(object, schema) {
     if (typeof schema !== "object")
         throw Error("object type isnt an object");

package/dist/cli/index.js

@@ -1,10 +1,29 @@
 #! /usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path = require("path");
-const readline = require("readline");
 const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const readline = __importStar(require("readline"));
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -16,7 +35,7 @@ rl.setPrompt("> ");
 const _require = require;
 const showMessage = (msg, exit) => {
     rl.write(`${msg}\n`);
-    if (exit != null)
+    if (exit)
         process.exit(exit);
     rl.setPrompt("> ");
 };
@@ -34,8 +53,8 @@ const makeDefineFile = async (modules, targetFile, isTS) => {
     const dirname = path.dirname(targetFile);
     const content = ["// domain-cli 自动生成"];
     const _exports = [];
-    for (let i = 0; i < modules.length; i += 1) {
-        const name = path.relative(dirname, modules[i]);
+    for (const x of modules) {
+        const name = path.relative(dirname, x);
         const variable = filePath2Var(name);
         if (isTS) {
             content.push(`import * as ${variable} from "./${name}"`);

package/dist/defaults.d.ts

@@ -1,18 +1,18 @@
-import * as _ from "lodash";
-import * as uuid from "uuid";
 import * as ajv from "ajv";
 import * as ajvFormats from "ajv-formats";
 import * as async from "async";
 import * as axios from "axios";
 import * as cronParser from "cron-parser";
-import humanInterval = require("human-interval");
-import * as IORedis from "ioredis";
-import * as LRU from "lru-cache";
+import humanInterval from "human-interval";
+import IORedis from "ioredis";
+import _ from "lodash";
+import LRU from "lru-cache";
+import moment from "moment";
 import * as mysql from "mysql2";
 import * as Sequelize from "sequelize";
-import * as moment from "moment";
-import * as utils from "./utils";
+import * as uuid from "uuid";
 import { errors } from "./basic-errors";
+import * as utils from "./utils";
 /** npm packages injection */
 export interface Defaults {
     /**

package/dist/defaults.js

@@ -1,35 +1,57 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaults = void 0;
-const _ = require("lodash");
-const uuid = require("uuid");
-const ajv = require("ajv");
-const ajvFormats = require("ajv-formats");
-const async = require("async");
-const axios = require("axios");
-const cronParser = require("cron-parser");
-const humanInterval = require("human-interval");
-const IORedis = require("ioredis");
-const LRU = require("lru-cache");
-const mysql = require("mysql2");
-const Sequelize = require("sequelize");
-const moment = require("moment");
-const utils = require("./utils");
+const ajv = __importStar(require("ajv"));
+const ajvFormats = __importStar(require("ajv-formats"));
+const async = __importStar(require("async"));
+const axios = __importStar(require("axios"));
+const cronParser = __importStar(require("cron-parser"));
+const human_interval_1 = __importDefault(require("human-interval"));
+const ioredis_1 = __importDefault(require("ioredis"));
+const lodash_1 = __importDefault(require("lodash"));
+const lru_cache_1 = __importDefault(require("lru-cache"));
+const moment_1 = __importDefault(require("moment"));
+const mysql = __importStar(require("mysql2"));
+const Sequelize = __importStar(require("sequelize"));
+const uuid = __importStar(require("uuid"));
 const basic_errors_1 = require("./basic-errors");
+const utils = __importStar(require("./utils"));
 exports.defaults = {
-    _,
+    _: lodash_1.default,
     uuid,
     ajv,
     ajvFormats,
     async,
     axios,
     cronParser,
-    humanInterval,
-    IORedis,
-    LRU,
+    humanInterval: human_interval_1.default,
+    IORedis: ioredis_1.default,
+    LRU: lru_cache_1.default,
     mysql,
     Sequelize,
-    moment,
+    moment: moment_1.default,
     utils,
     U: utils,
     errors: basic_errors_1.errors,

package/dist/deps/aes/index.js

@@ -1,8 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const cryptojs = require("crypto-js/core");
-const AES = require("crypto-js/aes");
+const cryptojs = __importStar(require("crypto-js/core"));
+const AES = __importStar(require("crypto-js/aes"));
 function Main() {
     // aes-256-cbc encrypt
     const encrypt = (message, key) => AES.encrypt(message, key).toString();

package/dist/deps/cache/Define.d.ts

@@ -1,5 +1,5 @@
-import * as LRU from "lru-cache";
-import * as Redis from "ioredis";
+import LRU from "lru-cache";
+import Redis from "ioredis";
 import { SetRequired } from "type-fest";
 export interface CnfDef {
     cache?: {

package/dist/deps/defines.js

@@ -1,36 +1,55 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 // domain-cli 自动生成
-const aes = require("./aes");
-const cache = require("./cache");
-const checker = require("./checker");
-const counter = require("./counter");
-const cron = require("./cron");
-const graceful = require("./graceful");
-const hash = require("./hash");
-const logger = require("./logger");
-const myCia = require("./myCia");
-const parallel = require("./parallel");
-const redis = require("./redis");
-const request = require("./request");
-const rest = require("./rest");
-const schema = require("./schema");
-const sequelize = require("./sequelize");
-const signer = require("./signer");
+const aes = __importStar(require("./aes"));
+const cache = __importStar(require("./cache"));
+const checker = __importStar(require("./checker"));
+const counter = __importStar(require("./counter"));
+const cron = __importStar(require("./cron"));
+const graceful = __importStar(require("./graceful"));
+const hash = __importStar(require("./hash"));
+const logger = __importStar(require("./logger"));
+const myCia = __importStar(require("./myCia"));
+const parallel = __importStar(require("./parallel"));
+const redis = __importStar(require("./redis"));
+const request = __importStar(require("./request"));
+const rest = __importStar(require("./rest"));
+const schema = __importStar(require("./schema"));
+const sequelize = __importStar(require("./sequelize"));
+const signer = __importStar(require("./signer"));
 module.exports = {
-    aes,
-    cache,
-    checker,
-    counter,
-    cron,
-    graceful,
-    hash,
-    logger,
-    myCia,
-    parallel,
-    redis,
-    request,
-    rest,
-    schema,
-    sequelize,
-    signer,
+    aes: aes,
+    cache: cache,
+    checker: checker,
+    counter: counter,
+    cron: cron,
+    graceful: graceful,
+    hash: hash,
+    logger: logger,
+    myCia: myCia,
+    parallel: parallel,
+    redis: redis,
+    request: request,
+    rest: rest,
+    schema: schema,
+    sequelize: sequelize,
+    signer: signer,
 };

package/dist/deps/graceful/index.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const process = require("process");
+const process_1 = __importDefault(require("process"));
 function Graceful(info) {
     let exiting = false; // 是否正在退出
     const callbacks = [];
-    const counter = ((count = 0) => {
+    const counter = ((init = 0) => {
+        let count = init;
         const decr = () => {
             count -= 1;
         };
@@ -53,11 +57,11 @@ function Graceful(info) {
                 return;
             info("process exit check success, process exited");
             clearInterval(timer);
-            process.exit(0);
+            process_1.default.exit(0);
         }, 1000);
     };
-    process.on("SIGTERM", exitHandle);
-    process.on("SIGINT", exitHandle);
+    process_1.default.on("SIGTERM", exitHandle);
+    process_1.default.on("SIGINT", exitHandle);
     /**
      * addListen function be called when process exit
      * @param listenner

package/dist/deps/logger/index.js

@@ -1,8 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
 function Main(cnf, deps) {
     const { logger: { errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;

package/dist/deps/myCia/errors.js

@@ -1,6 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const util = require("util");
+const util = __importStar(require("util"));
 exports.default = () => {
     const defines = [
         ["duplicatRegistMessage", "The message has been registed: %s"],

package/dist/deps/myCia/index.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const errors_1 = require("./errors");
+const errors_1 = __importDefault(require("./errors"));
 function Main(cnf, deps) {
     const { _, async, uuid: { v4: uuid }, logger, redis, graceful, U: { tryCatchLog }, } = deps;
     const { cia } = cnf;

package/dist/deps/parallel/index.js

@@ -1,7 +1,26 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const utils = require("../../utils");
+const utils = __importStar(require("../../utils"));
 /**
  * Parallel control module
  * @param cnf Module initialization configuration parameters

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

@@ -1,4 +1,4 @@
-import * as Redis from "ioredis";
+import Redis from "ioredis";
 interface Cnf {
     redis: Redis.RedisOptions;
 }

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

@@ -1,6 +1,6 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import * as Sequelize from "sequelize";
-import { TModel, Params } from "./defines";
+import { ModelBase, ModelStatic } from "../sequelize";
 import { Stats } from "./stats";
 import { Utils } from "./utils";
 export { Before } from "./Before";
@@ -24,14 +24,14 @@ export interface CreatorAndClientIp {
  * @returns modify, add, remove, list, stats five methods
  */
 export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Utils>): {
-    modify: (Model: TModel, model: Sequelize.Model<any, any>, params: Params, isAdmin?: boolean, _cols?: string[] | undefined) => Promise<Sequelize.Model<any, any>>;
-    add: (Model: TModel, params: Params, isAdmin: boolean | undefined, _cols: string[] | undefined, { creatorId, clientIp }: CreatorAndClientIp) => Promise<any>;
+    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: (Model: TModel, params: Params, allowAttrs?: string[] | undefined, toJSON?: boolean | undefined) => Promise<{
+    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: any[];
+        rows: T_2[];
     }>;
-    stats: (Model: TModel, params: Params, where?: any, conf?: {
+    stats: <T_3 extends ModelBase<any, any>>(Model: ModelStatic<T_3>, params: Record<string, any>, where?: any, conf?: {
         dimensions?: Record<string, string> | undefined;
         metrics: Record<string, string>;
         pagination?: {
@@ -41,7 +41,7 @@ export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Util
         } | undefined;
     } | undefined) => Promise<{
         count: number;
-        rows: any;
+        rows: Record<string, string | number>[];
     }>;
 };
 export declare const Deps: string[];

package/dist/deps/rest/index.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = exports.Before = void 0;
-const _ = require("lodash");
+const lodash_1 = __importDefault(require("lodash"));
 const stats_1 = require("./stats");
 var Before_1 = require("./Before");
 Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
@@ -63,7 +66,7 @@ function Main(cnf, deps, utils) {
             return Model.create(attr);
         // 如果设置了唯一属性，且开启了回收站功能
         // 则判断是否需要执行恢复操作
-        const where = _.pick(attr, Model.unique);
+        const where = lodash_1.default.pick(attr, Model.unique);
         // 根据条件查找资源
         const model = await Model.findOne({ where });
         // 资源不存在
@@ -110,10 +113,10 @@ function Main(cnf, deps, utils) {
         // 提高查询速度
         let count = 0;
         if (_ignoreTotal !== "yes")
-            count = await Model.count(_.pick(opt, COUNT_OPT));
+            count = await Model.count(lodash_1.default.pick(opt, COUNT_OPT));
         if (Array.isArray(allowAttrs) && allowAttrs.length)
             opt.attributes = allowAttrs;
-        const rows = (await Model.findAll(opt));
+        const rows = await Model.findAll(opt);
         if (toJSON) {
             for (let i = 0; i < rows.length; i += 1) {
                 rows[i] = rows[i].toJSON();

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

@@ -1,13 +1,21 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import * as Sequelize from "sequelize";
-import { Params, ModelExtraAtts, TModel } from "./defines";
+import { ModelBase, ModelStatic } from "../sequelize";
 import { Utils } from "./utils";
 interface Deps {
     _: typeof _;
     Sequelize: Pick<typeof Sequelize, "literal" | "and" | "fn">;
 }
-export declare function Stats(cnf: {}, deps: Deps, utils: ReturnType<typeof Utils>): (Model: TModel, params: Params, where?: any, conf?: ModelExtraAtts["stats"]) => Promise<{
+export declare function Stats(cnf: {}, deps: Deps, utils: ReturnType<typeof Utils>): <T extends ModelBase<any, any>>(Model: ModelStatic<T>, params: Record<string, any>, where?: any, conf?: {
+    dimensions?: Record<string, string> | undefined;
+    metrics: Record<string, string>;
+    pagination?: {
+        maxResults: number;
+        maxStartIndex: number;
+        maxResultsLimit: number;
+    } | undefined;
+} | undefined) => Promise<{
     count: number;
-    rows: any;
+    rows: Record<string, string | number>[];
 }>;
 export {};

package/dist/deps/rest/stats.js

@@ -149,7 +149,7 @@ function Stats(cnf, deps, utils) {
         let count = 0;
         if (_ignoreTotal !== "yes")
             count = await statsCount(Model, opt, dims);
-        const rows = await Model.findAll(opt);
+        const rows = (await Model.findAll(opt));
         for (const x of rows) {
             for (const met of metrics) {
                 x[met] = x[met] ? Number(x[met]) : 0;

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

@@ -1,15 +1,15 @@
-import * as _ from "lodash";
+import type { LoDashStatic } from "lodash";
+import moment from "moment";
 import * as mysql from "mysql2";
 import * as Sequelize from "sequelize";
-import * as moment from "moment";
-import { ModelExtraAtts, TModel, Params } from "./defines";
+import { ModelBase, ModelStatic } from "../sequelize";
 interface Cnf {
     rest: {
         relativeMaxRangeDays?: number;
     };
 }
 interface Deps {
-    _: typeof _;
+    _: LoDashStatic;
     mysql: Pick<typeof mysql, "escape">;
     moment: typeof moment extends (...args: infer A) => infer B ? (...args: A) => B : never;
     Sequelize: Pick<typeof Sequelize, "where" | "fn" | "col" | "literal" | "Op">;
@@ -19,11 +19,15 @@ interface Deps {
     };
 }
 export declare function Utils(cnf: Cnf, deps: Deps): Readonly<{
-    pickParams: (params: any, cols: string[], Model: TModel, isAdmin: boolean) => {
+    pickParams: <T extends ModelBase<any, any>>(params: any, cols: string[], Model: ModelStatic<T>, isAdmin: boolean) => {
         [propName: string]: any;
     };
-    findAllOpts: (Model: TModel, params: Params) => any;
-    pageParams: (pagination: ModelExtraAtts["pagination"], params: Params) => {
+    findAllOpts: <T_1 extends ModelBase<any, any>>(Model: ModelStatic<T_1>, params: Record<string, any>) => any;
+    pageParams: (pagination: {
+        maxResults: number;
+        maxStartIndex: number;
+        maxResultsLimit: number;
+    } | undefined, params: Record<string, any>) => {
         offset: number;
         limit: number;
     };