@domain.js/main 0.3.24 → 0.3.27

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

@@ -1,5 +1,5 @@
 import { Cache, CnfDef, DepsDef, PubSubDef } from "./Define";
-export { Before } from "./Before";
 export { After } from "./After";
+export { Before } from "./Before";
 export declare function Main(cnf: CnfDef, deps: DepsDef, pubsub?: PubSubDef): Cache;
 export declare const Deps: string[];

package/dist/deps/cache/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = exports.After = exports.Before = void 0;
-var Before_1 = require("./Before");
-Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
+exports.Deps = exports.Main = exports.Before = exports.After = void 0;
 var After_1 = require("./After");
 Object.defineProperty(exports, "After", { enumerable: true, get: function () { return After_1.After; } });
+var Before_1 = require("./Before");
+Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
 function Main(cnf, deps, pubsub) {
     let hits = 0; // 击中次数
     let misseds = 0; // 未击中次数

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

@@ -2,6 +2,7 @@ import _ from "lodash";
 import { v4 } from "uuid";
 interface Cnf {
     logger: {
+        level?: "info" | "error" | "none";
         clientId: string;
         errorLogPath: string;
         infoLogPath: string;

package/dist/deps/logger/index.js

@@ -4,19 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = require("fs");
+const promises_1 = __importDefault(require("fs/promises"));
 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: { errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
+    const { logger: { level, errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
     const { _, uuid: { v4: uuid }, } = deps;
     const makeDir = _.memoize((dir) => {
-        if (!fs_1.default.existsSync(dir))
-            fs_1.default.mkdirSync(dir);
+        if (!(0, fs_1.existsSync)(dir))
+            (0, fs_1.mkdirSync)(dir);
     });
     const ignores = new Set(ignoreErrors);
     const error = (e, extra) => {
+        if (level === "none")
+            return;
         if (!e) {
             console.trace("Logger.error but error is null or undefined");
             return;
@@ -49,14 +52,11 @@ function Main(cnf, deps) {
         }
         if (e.stack)
             content.push(JSON.stringify(e.stack));
-        try {
-            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
-        }
-        catch (err) {
-            console.error("Logger.error appendFileSync faid: %o", err);
-        }
+        promises_1.default.appendFile(file, `${content.join("\t")}\n`).catch(console.error);
     };
     const info = (message, extra) => {
+        if (level === "none" || level === "error")
+            return;
         const time = date();
         const today = time.split("T")[0];
         const dir = path_1.default.resolve(infoLogPath, today);
@@ -72,14 +72,11 @@ function Main(cnf, deps) {
                 content.push((0, util_1.format)(extra));
             }
         }
-        try {
-            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
-        }
-        catch (e) {
-            console.error("Logger.info appendFileSync faid: %o", e);
-        }
+        promises_1.default.appendFile(file, `${content.join("\t")}\n`).catch(console.error);
     };
     const logger = (fn, name, isAsync = false, transform = (x) => x, errorHandler = (e) => (e instanceof Error ? e.message : ""), argsHandler = JSON.stringify) => {
+        if (level === "none")
+            return fn;
         if (isAsync) {
             const handler = {
                 async apply(fn, me, args) {

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

@@ -9,6 +9,7 @@ interface Deps {
         Sequelize: typeof Sequelize;
     };
 }
+export declare const Deps: string[];
 declare type NonConstructorKeys<T> = {
     [P in keyof T]: T[P] extends new () => any ? never : P;
 }[keyof T];
@@ -17,7 +18,6 @@ export declare type ModelStatic<M extends ModelBase> = NonConstructor<typeof Mod
 export declare function Main(cnf: Cnf, deps: Deps): {
     [propName: string]: Sequelize;
 };
-export declare const Deps: string[];
 /** Model 上的 sort 设定类型 */
 export interface ModelSort<Fields extends string> {
     default: Fields;
@@ -43,6 +43,10 @@ export declare class ModelBase<Attrs extends {} = any, Attrs4Create extends {} =
      * @param pk 主键
      */
     static getByPk<M extends ModelBase>(this: ModelStatic<M>, pk: string | number): Promise<M | null>;
+    /** cache 是否开启 */
+    static cache: boolean;
+    /** 删除cache */
+    static delCache(_pk: string | number): void;
     /**
      * 基于主键获取某些数据的Mode实例列表，维持参数的顺序，自动维护内存级 cache
      * @param pks 主键数组
@@ -93,7 +97,5 @@ export declare class ModelBase<Attrs extends {} = any, Attrs4Create extends {} =
     };
     /** 联合唯一列名称集合，用来自动恢复软删除的资源 */
     static unique?: string[];
-    /** cache 是否开启 */
-    static cache: boolean;
 }
 export {};

package/dist/deps/sequelize/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelBase = exports.Deps = exports.Main = void 0;
+exports.ModelBase = exports.Main = exports.Deps = void 0;
 const sequelize_1 = require("sequelize");
+exports.Deps = ["Sequelize"];
 function Main(cnf, deps) {
     // 这里之所以要注入 Sequelize 是为了保证项目自身可以灵活选择自己的 Sequelize 版本, 这样改公共模块就会更加稳定, 避免频繁升级
     const { sequelize: dbs } = cnf;
@@ -14,7 +15,6 @@ function Main(cnf, deps) {
     return sequelizes;
 }
 exports.Main = Main;
-exports.Deps = ["Sequelize"];
 /**
  * Model 基类
  */
@@ -26,6 +26,8 @@ class ModelBase extends sequelize_1.Model {
     static getByPk(pk) {
         return this.findByPk(pk);
     }
+    /** 删除cache */
+    static delCache(_pk) { }
     /**
      * 基于主键获取某些数据的Mode实例列表，维持参数的顺序，自动维护内存级 cache
      * @param pks 主键数组
@@ -45,6 +47,8 @@ class ModelBase extends sequelize_1.Model {
     }
 }
 exports.ModelBase = ModelBase;
+/** cache 是否开启 */
+ModelBase.cache = true;
 /** 新增资源的时候可以写入的列名称集合 */
 ModelBase.writableCols = [];
 /** 编辑资源的时候可以写入的列名称集合 */
@@ -61,5 +65,3 @@ ModelBase.sort = {
     defaultDirection: "DESC",
     allow: ["id"],
 };
-/** cache 是否开启 */
-ModelBase.cache = true;

package/dist/http/utils.js

@@ -126,7 +126,8 @@ function Utils(cnf) {
                 throw Error("Params.__files disallow assignment");
             if (lodash_1.default.size(req.files))
                 params.__files = req.files;
-            return params;
+            // 将上传文件附加到 params 中
+            return { ...params, ...req.files };
         },
         /**
          *

package/package.json

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