@domain.js/main 0.7.15 → 1.0.0-alpha.1

package/dist/deps/defines.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 // domain-cli 自动生成
 const aes = __importStar(require("./aes"));
 const cache = __importStar(require("./cache"));
@@ -31,27 +45,25 @@ 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": aes,
-    "cache": cache,
-    "checker": checker,
-    "counter": counter,
-    "cron": cron,
-    "frequency": frequency,
-    "graceful": graceful,
-    "hash": hash,
-    "logger": logger,
-    "myCia": myCia,
-    "parallel": parallel,
-    "redis": redis,
-    "request": request,
-    "rest": rest,
-    "schema": schema,
-    "sequelize": sequelize,
-    "signer": signer,
+    aes: aes,
+    cache: cache,
+    checker: checker,
+    counter: counter,
+    cron: cron,
+    frequency: frequency,
+    graceful: graceful,
+    hash: hash,
+    logger: logger,
+    myCia: myCia,
+    parallel: parallel,
+    redis: redis,
+    rest: rest,
+    schema: schema,
+    sequelize: sequelize,
+    signer: signer,
 };

package/dist/deps/frequency/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Main = exports.Deps = void 0;
+exports.Deps = void 0;
+exports.Main = Main;
 exports.Deps = ["redis"];
 function Main(cnf, deps) {
     const { redis } = deps;
@@ -90,4 +91,3 @@ function Main(cnf, deps) {
     });
     return { control, check, incr, generate };
 }
-exports.Main = Main;

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

@@ -6,7 +6,7 @@ interface Deps {
 }
 export declare function Main(cnf: {}, deps: Deps): {
     runner: <F extends (...args: any[]) => any>(fn: F) => (...args: Parameters<F>) => any;
-    runnerAsync: <F_1 extends (...args: any[]) => Promise<any>>(fn: F_1) => (...args: Parameters<F_1>) => Promise<any>;
+    runnerAsync: <F extends (...args: any[]) => Promise<any>>(fn: F) => (...args: Parameters<F>) => Promise<any>;
     enabled: () => boolean;
     exit: (listenner: Function) => void;
     exitHandle: () => Promise<void>;

package/dist/deps/graceful/index.js

@@ -3,7 +3,8 @@ 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;
+exports.Deps = void 0;
+exports.Main = Main;
 const process_1 = __importDefault(require("process"));
 function Graceful(info) {
     let exiting = false; // 是否正在退出
@@ -116,5 +117,4 @@ function Main(cnf, deps) {
     const { logger } = deps;
     return Graceful(logger.info);
 }
-exports.Main = Main;
 exports.Deps = ["logger"];

package/dist/deps/hash/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = void 0;
+exports.Deps = void 0;
+exports.Main = Main;
 function Main(cnf, deps) {
     const { hash: { key: REDIS_KEY }, } = cnf;
     const { redis } = deps;
@@ -12,5 +13,4 @@ function Main(cnf, deps) {
     const incr = (key, step = 1) => redis.hincrby(REDIS_KEY, key, step);
     return { get, set, del, incr };
 }
-exports.Main = Main;
 exports.Deps = ["redis"];

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

@@ -1,5 +1,3 @@
-import _ from "lodash";
-import { v4 } from "uuid";
 interface Cnf {
     logger: {
         level?: "info" | "error" | "none";
@@ -10,17 +8,11 @@ interface Cnf {
     };
 }
 interface Deps {
-    _: {
-        memoize: typeof _.memoize;
-    };
-    uuid: {
-        v4: typeof v4;
-    };
 }
 export declare function Main(cnf: Cnf, deps: Deps): {
     error: (e: any, extra?: any) => void;
     info: (message: string, extra?: any) => void;
     logger: <T extends (...args: any[]) => any>(fn: T, name: string, isAsync?: boolean, transform?: (x: ReturnType<T>) => any, errorHandler?: (e: any) => string, argsHandler?: (arg: Parameters<T>) => string) => T;
 };
-export declare const Deps: string[];
+export declare const Deps: never[];
 export {};

package/dist/deps/logger/index.js

@@ -3,16 +3,18 @@ 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;
+exports.Deps = void 0;
+exports.Main = Main;
+const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const promises_1 = __importDefault(require("fs/promises"));
+const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
 const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
 function Main(cnf, deps) {
     const { logger: { level, errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
-    const { _, uuid: { v4: uuid }, } = deps;
-    const makeDir = _.memoize((dir) => {
+    const makeDir = lodash_1.default.memoize((dir) => {
         if (!(0, fs_1.existsSync)(dir))
             (0, fs_1.mkdirSync)(dir);
     });
@@ -55,7 +57,6 @@ function Main(cnf, deps) {
         makeDir(dir);
         const file = path_1.default.resolve(dir, "info.log");
         const content = [time, clientId, message];
-        // eslint-disable-next-line no-eq-null
         if (extra !== null || extra !== undefined) {
             try {
                 content.push(JSON.stringify(extra));
@@ -72,7 +73,7 @@ function Main(cnf, deps) {
         if (isAsync) {
             const handler = {
                 async apply(fn, me, args) {
-                    const callId = uuid();
+                    const callId = (0, crypto_1.randomUUID)();
                     try {
                         info(`Begin: ${name}\t${callId}\t${argsHandler(args)}`);
                         const startedAt = Date.now();
@@ -90,7 +91,7 @@ function Main(cnf, deps) {
         }
         const handler = {
             apply(fn, me, args) {
-                const callId = uuid();
+                const callId = (0, crypto_1.randomUUID)();
                 try {
                     info(`Begin: ${name}\t${callId}\t${argsHandler(args)}`);
                     const startedAt = Date.now();
@@ -108,5 +109,4 @@ function Main(cnf, deps) {
     };
     return { error, info, logger };
 }
-exports.Main = Main;
-exports.Deps = ["_", "uuid"];
+exports.Deps = [];

package/dist/deps/myCia/errors.d.ts

@@ -1,6 +1,6 @@
 declare const _default: () => {
     [key: string]: (...args: any[]) => Error & {
-        code?: string | undefined;
+        code?: string;
     };
 };
 export default _default;

package/dist/deps/myCia/errors.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const util = __importStar(require("util"));
 exports.default = () => {

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

@@ -1,6 +1,3 @@
-import * as _ from "lodash";
-import * as async from "async";
-import { v4 } from "uuid";
 interface Cnf {
     cia?: {
         concurrency?: number;
@@ -8,11 +5,6 @@ interface Cnf {
     };
 }
 interface Deps {
-    _: Pick<typeof _, "pick" | "map" | "isFunction">;
-    async: Pick<typeof async, "eachSeries" | "queue">;
-    uuid: {
-        v4: typeof v4;
-    };
     logger: {
         info: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -35,7 +27,7 @@ export interface Stats {
     errors: number;
     dones: number;
 }
-declare type Type = {
+type Type = {
     type: string;
     timeout?: number;
     validator?: Function;
@@ -54,7 +46,7 @@ export declare function Main(cnf: Cnf, deps: Deps): {
     getUnlinks: () => string[];
     regist: (name: string, validator: Function | undefined, types: Type[]) => number;
     link: (name: string, type: string, waiter: Function) => void;
-    submit: (name: string, data: any, callback?: Function | undefined) => void;
+    submit: (name: string, data: any, callback?: Function) => void;
     setFn: (type: "error" | "timeout", fn: (...args: any[]) => any) => void;
     domainPaths: Set<string>;
     modelHooks: Set<string>;

package/dist/deps/myCia/index.js

@@ -3,10 +3,14 @@ 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;
+exports.Deps = void 0;
+exports.Main = Main;
+const async_1 = __importDefault(require("async"));
+const crypto_1 = require("crypto");
+const lodash_1 = __importDefault(require("lodash"));
 const errors_1 = __importDefault(require("./errors"));
 function Main(cnf, deps) {
-    const { _, async, uuid: { v4: uuid }, logger, redis, graceful, U: { tryCatchLog }, } = deps;
+    const { logger, redis, graceful, U: { tryCatchLog }, } = deps;
     const { cia } = cnf;
     const concurrency = Math.max(1, ((cia && cia.concurrency) || 10) | 0);
     const storeKey = (cia && cia.storeKey) || "cia-store";
@@ -60,7 +64,7 @@ function Main(cnf, deps) {
         updateDoings(registed);
         doingCount += 1;
         let errorCount = 0;
-        await async.eachSeries(types, async (_type) => {
+        await async_1.default.eachSeries(types, async (_type) => {
             const { type, timeout, validator } = _type;
             // 看看是否有设置要忽略掉某些订阅者
             // 这个功能主要是留给应用无故中断后系统自动恢复的任务执行
@@ -124,8 +128,8 @@ function Main(cnf, deps) {
         for (const name of Object.keys(registeds)) {
             const { types } = registeds[name];
             stats[name] = {
-                ..._.pick(registeds[name], statsFields),
-                _types: types.map((x) => _.pick(x, "type", ...statsFields)),
+                ...lodash_1.default.pick(registeds[name], statsFields),
+                _types: types.map((x) => lodash_1.default.pick(x, "type", ...statsFields)),
             };
         }
         return stats;
@@ -134,7 +138,7 @@ function Main(cnf, deps) {
     // 这样就不会有未成功订阅函数执行遗漏的问题了
     // 例如: A 函数要监听 1 好消息的 save 类型，结果在完成订阅前，已经有某个区域 submit 了 1 号事件
     //       如果队列一开始不暂停就会出现A函数遗漏执行
-    const queue = async.queue(dispatch, concurrency);
+    const queue = async_1.default.queue(dispatch, concurrency);
     queue.pause();
     graceful.exit(async () => {
         exiting = true;
@@ -187,7 +191,7 @@ function Main(cnf, deps) {
             throw errors.registWhenReadyAfter(name);
         if (registeds[name])
             throw errors.duplicatRegistMessage(name);
-        const typeNames = new Set(_.map(types, "type"));
+        const typeNames = new Set(lodash_1.default.map(types, "type"));
         types.forEach((x) => {
             Object.assign(x, { pendings: 0, dones: 0, doings: 0, errors: 0 });
         });
@@ -227,7 +231,7 @@ function Main(cnf, deps) {
         const { typeNames } = registeds[name];
         if (!typeNames.has(type))
             throw errors.linkUnknowTypes(name, type);
-        if (!_.isFunction(waiter))
+        if (!lodash_1.default.isFunction(waiter))
             throw errors.linkListernerMustBeFunctionType(name, type);
         const key = `${name}::${type}`;
         if (waiters.get(key))
@@ -247,12 +251,12 @@ function Main(cnf, deps) {
             logger.error(errors.submitUnregistedMessage(name, data));
             return;
         }
-        if (callback && !_.isFunction(callback))
+        if (callback && !lodash_1.default.isFunction(callback))
             callback = undefined;
         const { validator } = registeds[name];
         if (validator)
             validator(data);
-        const id = uuid();
+        const id = (0, crypto_1.randomUUID)();
         queue.push({ id, name, data, callback });
         updatePendings(registeds[name]);
         logger.info(`cia.submit\t${id}`, { name, data });
@@ -307,5 +311,4 @@ function Main(cnf, deps) {
         modelHooks,
     };
 }
-exports.Main = Main;
-exports.Deps = ["_", "async", "logger", "utils", "redis", "graceful", "uuid"];
+exports.Deps = ["logger", "redis", "graceful"];

package/dist/deps/parallel/index.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,15 +15,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = void 0;
+exports.Deps = void 0;
+exports.Main = Main;
 const utils = __importStar(require("../../utils"));
 /**
  * Parallel control module
@@ -117,5 +132,4 @@ function Main(cnf, deps) {
     graceful.exit(onExit);
     return control;
 }
-exports.Main = Main;
 exports.Deps = ["async", "logger", "graceful", "redis"];

package/dist/deps/redis/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = void 0;
+exports.Deps = void 0;
+exports.Main = Main;
 /**
  * @link https://www.npmjs.com/package/ioredis
  *
@@ -25,5 +26,4 @@ function Main(cnf, deps) {
     };
     return Object.assign(rds, { update });
 }
-exports.Main = Main;
 exports.Deps = ["IORedis"];

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

@@ -1,5 +1,5 @@
 import { Utils } from "./utils";
-declare type Cnf = Parameters<typeof Utils>[0];
-declare type Deps = Parameters<typeof Utils>[1];
+type Cnf = Parameters<typeof Utils>[0];
+type Deps = Parameters<typeof Utils>[1];
 export declare function Before(cnf: Cnf, deps: Deps): [Cnf, Deps, ReturnType<typeof Utils>];
 export {};

package/dist/deps/rest/Before.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Before = void 0;
+exports.Before = Before;
 const utils_1 = require("./utils");
 function Before(cnf, deps) {
     const utils = (0, utils_1.Utils)(cnf, deps);
     return [cnf, deps, utils];
 }
-exports.Before = Before;

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

@@ -4,12 +4,12 @@ import { ModelBase, ModelStatic } from "../sequelize";
 import { Stats } from "./stats";
 import { Utils } from "./utils";
 export { Before } from "./Before";
-declare type Cnf = Parameters<typeof Utils>[0] & Parameters<typeof Stats>[0];
-declare type Deps = Parameters<typeof Utils>[1] & Parameters<typeof Stats>[1] & {
+type Cnf = Parameters<typeof Utils>[0] & Parameters<typeof Stats>[0];
+type Deps = Parameters<typeof Utils>[1] & Parameters<typeof Stats>[1] & {
     _: typeof _;
     Sequelize: Pick<typeof Sequelize, "literal" | "and" | "fn" | "Op">;
 };
-declare type UserId = string | number;
+type UserId = string | number;
 export interface CreatorAndClientIp {
     /** ID of the resource creator */
     creatorId: UserId;
@@ -24,28 +24,20 @@ export interface CreatorAndClientIp {
  * @returns modify, add, remove, list, stats five methods
  */
 export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Utils>): {
-    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>;
+    modify: <T extends ModelBase>(Model: ModelStatic<T>, model: T, params: Record<string, any>, isAdmin?: boolean, _cols?: string[]) => Promise<InstanceType<typeof Model>>;
+    add: <T extends ModelBase>(Model: ModelStatic<T>, params: Record<string, any>, isAdmin: boolean | undefined, _cols: string[] | undefined, { creatorId, clientIp }: CreatorAndClientIp) => Promise<T>;
     remove: (model: Sequelize.Model, deletorId: UserId) => Promise<void | Sequelize.Model<any, any>>;
     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[];
+        <T extends ModelBase, J = ReturnType<T["toJSON"]>>(Model: ModelStatic<T>, params: Record<string, any>, allowAttrs?: string[], toJSON?: false): Promise<{
+            rows: T[];
             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[];
+        <T extends ModelBase, J = ReturnType<T["toJSON"]>>(Model: ModelStatic<T>, params: Record<string, any>, allowAttrs?: string[], toJSON?: true): Promise<{
+            rows: J[];
             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?: {
-            maxResults: number;
-            maxStartIndex: number;
-            maxResultsLimit: number;
-        } | undefined;
-    } | undefined) => Promise<{
+    stats: <T extends ModelBase>(Model: ModelStatic<T>, params: Record<string, any>, where?: any, conf?: ModelStatic<T>["stats"]) => Promise<{
         count: number;
         rows: Record<string, string | number>[];
     }>;

package/dist/deps/rest/index.js

@@ -3,7 +3,8 @@ 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;
+exports.Deps = exports.Before = void 0;
+exports.Main = Main;
 const lodash_1 = __importDefault(require("lodash"));
 const stats_1 = require("./stats");
 var Before_1 = require("./Before");
@@ -116,5 +117,4 @@ function Main(cnf, deps, utils) {
     }
     return { modify, add, remove, list, stats: (0, stats_1.Stats)(cnf, deps, utils) };
 }
-exports.Main = Main;
-exports.Deps = ["errors", "_", "moment", "mysql", "Sequelize"];
+exports.Deps = ["errors", "_", "dayjs", "mysql", "Sequelize"];

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

@@ -6,15 +6,7 @@ interface Deps {
     _: typeof _;
     Sequelize: Pick<typeof Sequelize, "literal" | "and" | "fn">;
 }
-export declare function Stats(_cnf: any, 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<{
+export declare function Stats(_cnf: any, deps: Deps, utils: ReturnType<typeof Utils>): <T extends ModelBase>(Model: ModelStatic<T>, params: Record<string, any>, where?: any, conf?: ModelStatic<T>["stats"]) => Promise<{
     count: number;
     rows: Record<string, string | number>[];
 }>;

package/dist/deps/rest/stats.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stats = void 0;
+exports.Stats = Stats;
 function Stats(_cnf, deps, utils) {
     const defaultPagination = {
         maxResults: 10,
@@ -159,4 +159,3 @@ function Stats(_cnf, deps, utils) {
     };
     return statistics;
 }
-exports.Stats = Stats;

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

@@ -1,5 +1,5 @@
+import dayjs from "dayjs";
 import type { LoDashStatic } from "lodash";
-import moment from "moment";
 import * as mysql from "mysql2";
 import { ModelBase, ModelStatic } from "../sequelize";
 interface Cnf {
@@ -10,22 +10,18 @@ interface Cnf {
 interface Deps {
     _: LoDashStatic;
     mysql: Pick<typeof mysql, "escape">;
-    moment: typeof moment extends (...args: infer A) => infer B ? (...args: A) => B : never;
+    dayjs: typeof dayjs extends (...args: infer A) => infer B ? (...args: A) => B : never;
     errors: {
         notAllowed: (...args: any[]) => Error;
         resourceDuplicateAdd: (...args: any[]) => Error;
     };
 }
 export declare function Utils(cnf: Cnf, deps: Deps): Readonly<{
-    pickParams: <T extends ModelBase<any, any>>(params: any, cols: string[], Model: ModelStatic<T>, isAdmin: boolean) => {
+    pickParams: <T extends ModelBase>(params: any, cols: string[], Model: ModelStatic<T>, isAdmin: boolean) => {
         [propName: string]: any;
     };
-    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>) => {
+    findAllOpts: <T extends ModelBase>(Model: ModelStatic<T>, params: Record<string, any>) => any;
+    pageParams: (pagination: typeof ModelBase.pagination, params: Record<string, any>) => {
         offset: number;
         limit: number;
     };