@domain.js/main 1.0.0-alpha.2 → 1.0.0-alpha.4

package/dist/basic-errors.d.ts

@@ -1 +1 @@
-export declare const errors: Readonly<Record<"notFound" | "notAllowed" | "noAuth", import("./Errors").ErrorFn>>;
+export declare const errors: Readonly<Record<"notFound" | "notAllowed" | "noAuth" | "resourceDuplicateAdd", import("./Errors").ErrorFn>>;

package/dist/basic-errors.js

@@ -6,5 +6,6 @@ const defines = [
     ["notFound", "Resource not found"],
     ["notAllowed", "No access"],
     ["noAuth", "Not authentication"],
+    ["resourceDuplicateAdd", "Resource duplicate add"],
 ];
 exports.errors = Object.freeze((0, Errors_1.Errors)(defines));

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

@@ -1,11 +1,11 @@
-import { Redis } from "ioredis";
+import { Redis, RedisOptions } from "ioredis";
 import { LRUCache } from "lru-cache";
 export interface CnfDef {
     cache: {
         isMulti?: boolean;
         delSignalChannel?: string;
     } & LRUCache.Options<{}, {}, unknown>;
-    redis?: any;
+    redis?: RedisOptions;
 }
 export interface DepsDef {
     IORedis: typeof Redis;

package/dist/deps/cache/index.js

@@ -40,7 +40,7 @@ function Main(cnf, deps) {
     const needToBroad = Boolean(cnf.cache.isMulti);
     // 如果不是多节点分部署部署，则不需要处理
     // 开启多节点分布式部署后，要通过redis广播cache的del事件，依次来保持cache的有效性
-    if (needToBroad) {
+    if (needToBroad && cnf.redis) {
         const pub = new IORedis(cnf.redis);
         const sub = new IORedis(cnf.redis);
         const { delSignalChannel = "LRU_DEL_SIGNAL_CHANNEL" } = cnf.cache;

package/dist/deps/defines.d.ts

@@ -1,6 +1,5 @@
 import * as aes from "./aes";
 import * as cache from "./cache";
-import * as checker from "./checker";
 import * as counter from "./counter";
 import * as cron from "./cron";
 import * as frequency from "./frequency";
@@ -17,7 +16,6 @@ import * as signer from "./signer";
 declare const _default: {
     aes: typeof aes;
     cache: typeof cache;
-    checker: typeof checker;
     counter: typeof counter;
     cron: typeof cron;
     frequency: typeof frequency;

package/dist/deps/defines.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 // domain-cli 自动生成
 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 frequency = __importStar(require("./frequency"));
@@ -52,7 +51,6 @@ const signer = __importStar(require("./signer"));
 module.exports = {
     aes: aes,
     cache: cache,
-    checker: checker,
     counter: counter,
     cron: cron,
     frequency: frequency,

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

@@ -1,7 +1,6 @@
-import { eachLimit, forever, whilst } from "async";
 import { Redis } from "ioredis";
-import { Main as Logger } from "../logger";
 import { Main as Graceful } from "../graceful";
+import { Main as Logger } from "../logger";
 interface Cnf {
     parallel: {
         /** Record the redis key prefix of the concurrency control lock */
@@ -26,12 +25,6 @@ interface Deps {
     };
     /** redis instance */
     redis: Pick<Redis, "get" | "set" | "del" | "expire" | "exists">;
-    /** async package */
-    async: {
-        eachLimit: typeof eachLimit;
-        whilst: typeof whilst;
-        forever: typeof forever;
-    };
 }
 export interface Option {
     path: string;

package/dist/deps/parallel/index.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = void 0;
 exports.Main = Main;
+const async_1 = require("async");
 const utils = __importStar(require("../../utils"));
 /**
  * Parallel control module
@@ -44,7 +45,7 @@ const utils = __importStar(require("../../utils"));
  */
 function Main(cnf, deps) {
     const { parallel: { key: KEY, defaultErrorFn, maxExpireSeconds = 300, resetExpireIntervalMS = 100 * 1000, }, } = cnf;
-    const { async, logger, graceful, redis } = deps;
+    const { logger, graceful, redis } = deps;
     const { sleep } = utils;
     // 存放当前处于执行中的 key
     const doings = new Set();
@@ -53,7 +54,7 @@ function Main(cnf, deps) {
     const onExit = async () => {
         exiting = true;
         logger.info("graceful.onExit parallel start", [...doings]);
-        await async.eachLimit([...doings], 10, async (key) => {
+        await (0, async_1.eachLimit)([...doings], 10, async (key) => {
             doings.delete(key);
             await redis.del(key);
             logger.info(`graceful.onExit parallel del: ${key}`);
@@ -63,11 +64,11 @@ function Main(cnf, deps) {
     const delay = async () => {
         if (!doings.size)
             return;
-        await async.eachLimit([...doings], 10, async (key) => {
+        await (0, async_1.eachLimit)([...doings], 10, async (key) => {
             await redis.expire(key, maxExpireSeconds);
         });
     };
-    async.forever(async () => {
+    (0, async_1.forever)(async () => {
         try {
             await sleep(resetExpireIntervalMS);
             await delay();
@@ -110,7 +111,7 @@ function Main(cnf, deps) {
                 if (!needWaitMS)
                     throw error;
                 // 需要等待
-                await async.whilst(async () => Boolean(await redis.exists(key)), async () => sleep(needWaitMS));
+                await (0, async_1.whilst)(async () => Boolean(await redis.exists(key)), async () => sleep(needWaitMS));
                 return paralleled(...args);
             }
             const startAt = Date.now(); // 执行开始毫秒数
@@ -132,4 +133,4 @@ function Main(cnf, deps) {
     graceful.exit(onExit);
     return control;
 }
-exports.Deps = ["async", "logger", "graceful", "redis"];
+exports.Deps = ["logger", "graceful", "redis"];

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

@@ -8,6 +8,7 @@ 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">;
+    errors: any;
 };
 type UserId = string | number;
 export interface CreatorAndClientIp {
@@ -42,4 +43,4 @@ export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Util
         rows: Record<string, string | number>[];
     }>;
 };
-export declare const Deps: string[];
+export declare const Deps: never[];

package/dist/deps/rest/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "Before", { enumerable: true, get: function () {
  * @returns modify, add, remove, list, stats five methods
  */
 function Main(cnf, deps, utils) {
-    const { errors } = deps;
     const { findAllOpts, pickParams } = utils;
     /**
      * Restful modify(U of CRUD) for update a resource
@@ -75,7 +74,7 @@ function Main(cnf, deps, utils) {
             return Model.create(attr);
         // 资源存在但是并非已删除的，抛出资源重复添加的error
         if (model.isDeleted === "no")
-            throw errors.resourceDuplicateAdd(where);
+            throw deps.errors.resourceDuplicateAdd(where);
         // 资源存在，恢复
         model.isDeleted = "no";
         Object.assign(model, attr);
@@ -117,4 +116,4 @@ function Main(cnf, deps, utils) {
     }
     return { modify, add, remove, list, stats: (0, stats_1.Stats)(cnf, deps, utils) };
 }
-exports.Deps = ["errors", "_", "dayjs", "mysql", "Sequelize"];
+exports.Deps = [];

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

@@ -1,6 +1,3 @@
-import dayjs from "dayjs";
-import type { LoDashStatic } from "lodash";
-import * as mysql from "mysql2";
 import { ModelBase, ModelStatic } from "../sequelize";
 interface Cnf {
     rest: {
@@ -8,13 +5,6 @@ interface Cnf {
     };
 }
 interface Deps {
-    _: LoDashStatic;
-    mysql: Pick<typeof mysql, "escape">;
-    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>(params: any, cols: string[], Model: ModelStatic<T>, isAdmin: boolean) => {

package/dist/deps/rest/utils.js

@@ -32,13 +32,18 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = Utils;
+const dayjs_1 = __importDefault(require("dayjs"));
+const lodash_1 = __importDefault(require("lodash"));
 const mysql = __importStar(require("mysql2"));
 const sequelize_1 = require("sequelize");
+const basic_errors_1 = require("../../basic-errors");
 function Utils(cnf, deps) {
     const { rest: { relativeMaxRangeDays: RELATIVE_MAX_RANGE = 100 }, } = cnf;
-    const { _, errors, dayjs } = deps;
     /**
      * 相对多少天的时间
      * @param Number days 相对多少天
@@ -55,19 +60,19 @@ function Utils(cnf, deps) {
     const pickParams = (params, cols, Model, isAdmin) => {
         const attr = {};
         const { rawAttributes, onlyAdminCols = [] } = Model;
-        _.each(cols, (x) => {
-            if (!_.has(params, x))
+        lodash_1.default.each(cols, (x) => {
+            if (!lodash_1.default.has(params, x))
                 return;
-            if (!_.has(rawAttributes, x))
+            if (!lodash_1.default.has(rawAttributes, x))
                 return;
             const C = rawAttributes[x];
             // 当设置了只有管理员才可以修改的字段，并且当前用户不是管理员
             // 则去掉那些只有管理员才能修改的字段
-            if (onlyAdminCols && !isAdmin && _.includes(onlyAdminCols, x))
+            if (onlyAdminCols && !isAdmin && lodash_1.default.includes(onlyAdminCols, x))
                 return;
             let value = params[x];
             // 如果字段允许为空，且默认值为 null 则在等于空字符串的时候赋值为 null
-            if ((value === "" || value === null || value === undefined) && _.has(C, "defaultValue")) {
+            if ((value === "" || value === null || value === undefined) && lodash_1.default.has(C, "defaultValue")) {
                 value = C.allowNull === true ? null : C.defaultValue;
             }
             attr[x] = value;
@@ -90,12 +95,12 @@ function Utils(cnf, deps) {
             const order = isDesc ? x.slice(1) : x;
             const theOrder = order.split(".");
             // 如果请求的排序方式不允许，则返回null
-            if (theOrder.length !== 2 && (!conf.allow || !_.includes(conf.allow, order)))
+            if (theOrder.length !== 2 && (!conf.allow || !lodash_1.default.includes(conf.allow, order)))
                 return undefined;
             // 处理使用模型名称作为关联名称按关联模型的 字段 排序
             if (theOrder.length === 2) {
                 if (includes && Array.isArray(params._includes)) {
-                    const ret = _.filter(params._includes, (val) => includes[val]);
+                    const ret = lodash_1.default.filter(params._includes, (val) => includes[val]);
                     if (!ret.includes(theOrder[0]) ||
                         !((_a = includes[theOrder[0]].model.sort) === null || _a === void 0 ? void 0 : _a.allow.includes(theOrder[1]))) {
                         return undefined;
@@ -108,7 +113,7 @@ function Utils(cnf, deps) {
             theOrder.push(direction);
             return theOrder;
         });
-        return _.compact(orders);
+        return lodash_1.default.compact(orders);
     };
     // searchOpt 的处理，处理参数参数里的q, 实现简易搜索功能
     /**
@@ -138,16 +143,16 @@ function Utils(cnf, deps) {
     const searchOpt = (Model, searchStr, qstr, as) => {
         if (!qstr)
             return undefined;
-        if (!_.isString(qstr))
+        if (!lodash_1.default.isString(qstr))
             return undefined;
-        const q = qstr.trim() ? _.split(qstr.trim(), " ", 5) : null;
+        const q = qstr.trim() ? lodash_1.default.split(qstr.trim(), " ", 5) : null;
         if (!q)
             return undefined;
-        const searchs = searchStr ? _.split(searchStr, ",") : null;
+        const searchs = searchStr ? lodash_1.default.split(searchStr, ",") : null;
         const ors = [];
         if (!Model.searchCols)
             return undefined;
-        _.each(Model.searchCols, (conf, col) => {
+        lodash_1.default.each(Model.searchCols, (conf, col) => {
             // 如果设置了搜索的字段，并且当前字读不在设置的搜索字段内，则直接返回
             // 相当于跳过这个设置
             const _col = as ? `${as}.${col}` : col;
@@ -155,10 +160,10 @@ function Utils(cnf, deps) {
             // 这么做是为了避免用户不知情的一些筛选过滤
             if (!searchs && as)
                 return;
-            if (searchs && searchs.length && !_.includes(searchs, _col))
+            if (searchs && searchs.length && !lodash_1.default.includes(searchs, _col))
                 return;
-            ors.push(_.map(q, (x) => {
-                const arr = _.map(conf.match, (match) => {
+            ors.push(lodash_1.default.map(q, (x) => {
+                const arr = lodash_1.default.map(conf.match, (match) => {
                     const v = match.replace("{1}", x);
                     return [`(\`${as || Model.name}\`.\`${col}\``, conf.op, `${mysql.escape(v)})`].join(" ");
                 });
@@ -173,16 +178,16 @@ function Utils(cnf, deps) {
     // 单个关键词在不同的搜索字段之间是 OR 的关系
     const mergeSearchOrs = (orss) => {
         const ands = [];
-        _.each(orss, (_orss) => {
-            _.each(_orss, (ors) => {
-                _.each(ors, (_or, index) => {
+        lodash_1.default.each(orss, (_orss) => {
+            lodash_1.default.each(_orss, (ors) => {
+                lodash_1.default.each(ors, (_or, index) => {
                     if (!ands[index])
                         ands[index] = [];
                     ands[index].push(_or);
                 });
             });
         });
-        const andsStr = _.map(ands, (x) => `(${x.join(" OR ")})`);
+        const andsStr = lodash_1.default.map(ands, (x) => `(${x.join(" OR ")})`);
         return `(${andsStr.join(" AND ")})`;
     };
     // 处理关联包含
@@ -194,11 +199,11 @@ function Utils(cnf, deps) {
             return undefined;
         if (!Array.isArray(params._includes))
             return undefined;
-        const ret = _.filter(params._includes, (x) => includes[x]);
+        const ret = lodash_1.default.filter(params._includes, (x) => includes[x]);
         if (ret.length === 0)
             return undefined;
         // 这里之所以要用 _.clone 是为了防止修改了原始了配置信息，从而导致不同请求之间的干扰
-        return _.map(ret, (x) => _.clone(includes[x]));
+        return lodash_1.default.map(ret, (x) => lodash_1.default.clone(includes[x]));
     };
     const DEFAULT_PAGE_PARAMS = Object.freeze({
         maxResults: 10,
@@ -214,7 +219,7 @@ function Utils(cnf, deps) {
             limit: Math.min(maxResults, _pagination.maxResultsLimit),
         };
     };
-    const RELATIVE_RANGE_ERROR = errors.notAllowed(`相对时间跨度最多 ${RELATIVE_MAX_RANGE} 天`);
+    const RELATIVE_RANGE_ERROR = basic_errors_1.errors.notAllowed(`相对时间跨度最多 ${RELATIVE_MAX_RANGE} 天`);
     // findOptFilter 的处理
     // eslint-disable-next-line complexity
     const findOptFilter = (params, name, where, modelAlias4Ins, col = name) => {
@@ -224,7 +229,7 @@ function Utils(cnf, deps) {
         if (typeof params !== "object")
             return;
         // 处理相对时间过滤
-        if (_.isString(params[`${name}_relative`])) {
+        if (lodash_1.default.isString(params[`${name}_relative`])) {
             let [start, end, ignoreYear] = params[`${name}_relative`].split(",");
             start |= 0;
             end |= 0;
@@ -237,8 +242,8 @@ function Utils(cnf, deps) {
                 where[col][sequelize_1.Op.and] = [];
             if (ignoreYear) {
                 // 忽略年，这里要处理跨年的问题
-                const startDate = dayjs(Date.now() + start * 86400000).format("MM-DD");
-                const endDate = dayjs(Date.now() + end * 86400000).format("MM-DD");
+                const startDate = (0, dayjs_1.default)(Date.now() + start * 86400000).format("MM-DD");
+                const endDate = (0, dayjs_1.default)(Date.now() + end * 86400000).format("MM-DD");
                 if (endDate < startDate) {
                     where[col][sequelize_1.Op.and].push({
                         [sequelize_1.Op.or]: [
@@ -258,7 +263,7 @@ function Utils(cnf, deps) {
             }
         }
         // 处理 where 的等于
-        if (_.isString(params[name])) {
+        if (lodash_1.default.isString(params[name])) {
             value = params[name].trim();
             // 特殊处理null值
             if (value === ".null.")
@@ -267,37 +272,37 @@ function Utils(cnf, deps) {
                 where[col] = {};
             where[col][sequelize_1.Op.eq] = value;
         }
-        if (_.isNumber(params[name])) {
+        if (lodash_1.default.isNumber(params[name])) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.eq] = params[name];
         }
         // 处理where in
-        if (_.isString(params[`${name}s`])) {
+        if (lodash_1.default.isString(params[`${name}s`])) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.in] = params[`${name}s`].trim().split(",");
         }
         // in 直接是数组的格式
-        if (_.isArray(params[`${name}s`])) {
+        if (lodash_1.default.isArray(params[`${name}s`])) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.in] = params[`${name}s`];
         }
         // 处理where not in
-        if (_.isString(params[`${name}s!`])) {
+        if (lodash_1.default.isString(params[`${name}s!`])) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.notIn] = params[`${name}s!`].trim().split(",");
         }
         // not in 直接是数组的格式
-        if (_.isArray(params[`${name}s!`])) {
+        if (lodash_1.default.isArray(params[`${name}s!`])) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.notIn] = params[`${name}s!`];
         }
         // 处理不等于的判断
-        if (_.isString(params[`${name}!`])) {
+        if (lodash_1.default.isString(params[`${name}!`])) {
             value = params[`${name}!`].trim();
             if (!where[col])
                 where[col] = {};
@@ -311,14 +316,14 @@ function Utils(cnf, deps) {
             }
         }
         // 处理like
-        if (_.isString(params[`${name}_like`])) {
+        if (lodash_1.default.isString(params[`${name}_like`])) {
             value = params[`${name}_like`].trim().replace(/\*/g, "%").replace(/_/g, "\\_");
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.like] = value;
         }
         // 处理likes [like or]
-        if (_.isString(params[`${name}_likes`])) {
+        if (lodash_1.default.isString(params[`${name}_likes`])) {
             const likes = params[`${name}_likes`].trim().split(",");
             if (!where[col])
                 where[col] = {};
@@ -328,36 +333,36 @@ function Utils(cnf, deps) {
             });
         }
         // 处理notLike
-        if (_.isString(params[`${name}_notLike`])) {
+        if (lodash_1.default.isString(params[`${name}_notLike`])) {
             value = params[`${name}_notLike`].trim().replace(/\*/g, "%").replace(/_/g, "\\_");
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.notLike] = value;
         }
         // 处理大于，小于, 大于等于，小于等于的判断
-        _.each(["gt", "gte", "lt", "lte"], (x) => {
+        lodash_1.default.each(["gt", "gte", "lt", "lte"], (x) => {
             const c = `${name}_${x}`;
-            if (!_.isString(params[c]) && !_.isNumber(params[c]))
+            if (!lodash_1.default.isString(params[c]) && !lodash_1.default.isNumber(params[c]))
                 return;
-            value = _.isString(params[c]) ? params[c].trim() : params[c];
+            value = lodash_1.default.isString(params[c]) ? params[c].trim() : params[c];
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op[x]] = value;
         });
         // 处理 find_in_set 方式的过滤
-        if (_.isString(params[`${name}_ins`]) || _.isNumber(params[`${name}_ins`])) {
+        if (lodash_1.default.isString(params[`${name}_ins`]) || lodash_1.default.isNumber(params[`${name}_ins`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", params[`${name}_ins`], sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.gte, 1));
         }
         // 处理 json_contains 方式的过滤
-        if (_.isString(params[`${name}_contains`]) || _.isNumber(params[`${name}_contains`])) {
+        if (lodash_1.default.isString(params[`${name}_contains`]) || lodash_1.default.isNumber(params[`${name}_contains`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("JSON_CONTAINS", sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`), params[`${name}_contains`]), true));
         }
         // 处理 find_in_set 方式的过滤 _ins_and
-        if (_.isString(params[`${name}_ins_and`])) {
+        if (lodash_1.default.isString(params[`${name}_ins_and`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_and`].split(",")) {
@@ -365,7 +370,7 @@ function Utils(cnf, deps) {
             }
         }
         // 处理 find_in_set 方式的过滤 _ins_or
-        if (_.isString(params[`${name}_ins_or`])) {
+        if (lodash_1.default.isString(params[`${name}_ins_or`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             where[sequelize_1.Op.and].push({
@@ -373,7 +378,7 @@ function Utils(cnf, deps) {
             });
         }
         // 处理 find_in_set 方式的过滤 _ins_not
-        if (_.isString(params[`${name}_ins_not`])) {
+        if (lodash_1.default.isString(params[`${name}_ins_not`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_not`].split(",")) {
@@ -386,7 +391,7 @@ function Utils(cnf, deps) {
         const where = {};
         const searchOrs = [];
         const includes = modelInclude(params, Model.includes);
-        _.each(Model.filterAttrs || _.keys(Model.rawAttributes), (name) => {
+        lodash_1.default.each(Model.filterAttrs || lodash_1.default.keys(Model.rawAttributes), (name) => {
             findOptFilter(params, name, where, Model.name);
         });
         if (!params._showDeleted) {
@@ -403,10 +408,10 @@ function Utils(cnf, deps) {
         // 处理关联资源的过滤条件
         // 以及关联资源允许返回的字段
         if (includes) {
-            _.each(includes, (x) => {
+            lodash_1.default.each(includes, (x) => {
                 const includeWhere = {};
-                const filterAttrs = x.model.filterAttrs || _.keys(x.model.rawAttributes);
-                _.each(filterAttrs, (name) => {
+                const filterAttrs = x.model.filterAttrs || lodash_1.default.keys(x.model.rawAttributes);
+                lodash_1.default.each(filterAttrs, (name) => {
                     findOptFilter(params, `${x.as}.${name}`, includeWhere, x.as, name);
                 });
                 const rawAttributes = x.model.getAttributes();
@@ -439,8 +444,8 @@ function Utils(cnf, deps) {
             order: sort(params, Model.sort, Model.includes),
         };
         // 将 searchOrs 赋到 where 上
-        const _searchOrs = _.filter(_.compact(searchOrs), (x) => x.length);
-        if (_.size(where) || where[sequelize_1.Op.and] || where[sequelize_1.Op.or] || where[sequelize_1.Op.not]) {
+        const _searchOrs = lodash_1.default.filter(lodash_1.default.compact(searchOrs), (x) => x.length);
+        if (lodash_1.default.size(where) || where[sequelize_1.Op.and] || where[sequelize_1.Op.or] || where[sequelize_1.Op.not]) {
             if (_searchOrs.length) {
                 ret.where = sequelize_1.Sequelize.and(where, (0, sequelize_1.literal)(mergeSearchOrs(_searchOrs)));
             }

package/dist/http/index.js

@@ -74,7 +74,7 @@ function Main(cnf, deps) {
                 console.error(err);
                 process.exit(1);
             }
-            console.log("%s listening at %s", host, address);
+            console.log("[%s] listening at %s", new Date().toISOString(), address);
         });
         return server;
     };

package/dist/http/router.js

@@ -11,7 +11,6 @@ function Router(deps) {
     const { ucwords, makeParams, makeProfile, outputCSV } = utils;
     const apis = [];
     let apisHTML = "<h3>API 目录，点击可以查看参数格式定义</h3>";
-    console.error("server", server, "server");
     /** 判断是否需要提供apis的查询接口 */
     if (apisRoute) {
         server.get(`/${apisRoute}`, (req, res) => {

package/dist/http/utils.js

@@ -142,6 +142,7 @@ function Utils(cnf) {
          * 构造领域方法所需的 params 参数
          */
         async makeParams(req) {
+            var _a;
             let params = { ...(req.query || {}), ...(req.params || {}) };
             if (lodash_1.default.isObject(req.body) && !Array.isArray(req.body)) {
                 params = { ...(req.body || {}), ...params };
@@ -154,9 +155,23 @@ function Utils(cnf) {
                 if (params[k] && lodash_1.default.isString(params[k]))
                     params[k] = params[k].split(",");
             }
-            const files = await RestifyFileConvertUploadFiles(await req.file());
+            // 检查请求是否包含文件上传
+            let files = {};
+            try {
+                // 只有在 multipart 请求时才处理文件
+                if ((_a = req.headers["content-type"]) === null || _a === void 0 ? void 0 : _a.includes("multipart/form-data")) {
+                    const uploadedFile = await req.file();
+                    if (uploadedFile) {
+                        files = await RestifyFileConvertUploadFiles(uploadedFile);
+                    }
+                }
+            }
+            catch (error) {
+                // 如果文件处理出错，记录错误但不中断请求处理
+                console.warn("File upload processing error:", error);
+            }
             // 将上传文件附加到 params 中
-            return { ...params, ...req.files };
+            return { ...params, ...files };
         },
         /**
          *

package/dist/index.d.ts

@@ -1,17 +1,17 @@
 import { Defaults } from "./defaults";
 import Deps = require("./deps/defines");
-import type { CnfDef as CacheCnfDef } from "./deps/cache";
 export { Main as Cfg } from "./cfg";
 export * as DM from "./dm";
 export { Errors } from "./Errors";
 export { Main as Http } from "./http";
 export * as utils from "./utils";
-export declare const basicErrors: Readonly<Record<"notFound" | "notAllowed" | "noAuth", import("./Errors").ErrorFn>>;
+export declare const basicErrors: Readonly<Record<"notFound" | "notAllowed" | "noAuth" | "resourceDuplicateAdd", import("./Errors").ErrorFn>>;
 type TDeps = typeof Deps;
+export type Feature = keyof typeof Deps;
 /**
  * 获取模块配置类型
  */
-type ModuleConfig<T extends keyof TDeps> = T extends "cache" ? CacheCnfDef : TDeps[T]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {};
+type ModuleConfig<T extends keyof TDeps> = Parameters<TDeps[T]["Main"]>[0];
 /**
  * 获取模块返回类型
  */
@@ -19,8 +19,8 @@ type ModuleReturn<T extends keyof TDeps> = ReturnType<TDeps[T]["Main"]>;
 /**
  * 合并多个模块的配置类型（可选）
  */
-type MergeConfigs<T extends readonly (keyof TDeps)[]> = {
-    [K in T[number]]?: ModuleConfig<K>;
+type Merge<T> = {
+    [k in keyof T]: T[k];
 };
 /**
  * 合并多个模块的返回类型
@@ -28,4 +28,4 @@ type MergeConfigs<T extends readonly (keyof TDeps)[]> = {
 type MergeReturns<T extends readonly (keyof TDeps)[]> = {
     [K in T[number]]: ModuleReturn<K>;
 };
-export declare function Main<T extends readonly (keyof TDeps)[]>(features: T): (cnf?: MergeConfigs<T>) => MergeReturns<T> & Defaults;
+export declare function Main<T extends Feature[] | Readonly<Feature[]> | ReadonlyArray<Feature>>(features: T): (cnf?: Merge<ModuleConfig<T[number]>>) => MergeReturns<T> & Defaults;

package/dist/index.js

@@ -42,6 +42,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const defaults_1 = require("./defaults");
 const DM = __importStar(require("./dm"));
 const Deps = require("./deps/defines");
+// 显式导入 cache 模块的类型定义
 var cfg_1 = require("./cfg");
 Object.defineProperty(exports, "Cfg", { enumerable: true, get: function () { return cfg_1.Main; } });
 exports.DM = __importStar(require("./dm"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {

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

@@ -1,15 +0,0 @@
-import { someSeries } from "async";
-interface Deps {
-    async: {
-        someSeries: typeof someSeries;
-    };
-    errors: {
-        notAllowed(...args: any[]): Error;
-    };
-}
-export declare function Main(cnf: {}, deps: Deps): {
-    equal: (v1: any, v2: any) => boolean;
-    privacy: (fns: [Function, ...any[]][], error?: Error) => Promise<void>;
-};
-export declare const Deps: string[];
-export {};

package/dist/deps/checker/index.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = void 0;
-exports.Main = Main;
-function Main(cnf, deps) {
-    const { async, errors } = deps;
-    /** 检测两个值是否相等 */
-    const equal = (v1, v2) => v1 === v2;
-    /** 判断判断，一次执行数组里的函数 遇到成功的立刻停止，否则抛出信息 */
-    const PRIVACY_DEFAULT_ERROR = errors.notAllowed("权限不足");
-    const privacy = async (fns, error = PRIVACY_DEFAULT_ERROR) => {
-        const passed = (await async.someSeries(fns, async ([fn, ...args]) => {
-            const ret = await fn(...args);
-            return ret;
-        }));
-        if (!passed)
-            throw error;
-    };
-    return {
-        equal,
-        privacy,
-    };
-}
-exports.Deps = ["errors", "async"];