@domain.js/main 0.1.7 → 0.1.11

package/.husky/pre-commit

@@ -5,3 +5,4 @@ fi
 . "$(dirname "$0")/_/husky.sh"
 
 ts-node src/cli/index.ts loadDeps ./src/deps ts && npm run lint-staged && npm run build 
+npm tst

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

@@ -16,7 +16,7 @@ interface callbackArg {
 interface Deps {
     cronParser: typeof cronParser;
     humanInterval: typeof human;
-    cia: {
+    myCia: {
         regist: (name: string, validator: any, waiters: waiter[]) => void;
         submit: (name: string, times: number, callback: (arg: callbackArg) => void) => void;
     };

package/dist/deps/cron/index.js

@@ -4,7 +4,7 @@ exports.Deps = exports.Main = void 0;
 function Main(cnf, deps) {
     const { cron = {} } = cnf;
     const ciaTaskType = "cronJob";
-    const { cia, humanInterval: human, cronParser: parser } = deps;
+    const { myCia, humanInterval: human, cronParser: parser } = deps;
     const { tz = "Asia/Shanghai" } = cron;
     // 注册信息
     const registed = {};
@@ -40,7 +40,7 @@ function Main(cnf, deps) {
         setTimeout(() => {
             opt.times += 1;
             opt.triggeredAt = Date.now();
-            cia.submit(`Cron::${name}`, opt.times, ({ cronJob: [err, , totalMS] }) => {
+            myCia.submit(`Cron::${name}`, opt.times, ({ cronJob: [err, , totalMS] }) => {
                 if (err) {
                     opt.failds += 1;
                 }
@@ -72,7 +72,7 @@ function Main(cnf, deps) {
         };
         // 注册到cia上, 为了借助cia的能力自动下发任务
         // 增加 Cron:: 前缀是为了避免和其他任务名称冲突
-        cia.regist(`Cron::${name}`, null, [{ type: ciaTaskType }]);
+        myCia.regist(`Cron::${name}`, null, [{ type: ciaTaskType }]);
     };
     const start = () => {
         if (startedAt)

package/dist/deps/rest/index.js

@@ -24,14 +24,23 @@ function Main(cnf, deps, utils) {
      * @param _cols Allow columns to be updated
      * @returns The resource that has been updated
      */
-    const modify = (Model, model, params, isAdmin = false, _cols) => {
+    const modify = async (Model, model, params, isAdmin = false, _cols) => {
         const cols = _cols || Model.editableCols || Model.writableCols || [];
         const attr = pickParams(params, cols, Model, isAdmin);
         // 避免id 被篡改，强制删除id属性
         if (attr.id)
             delete attr.id;
         Object.assign(model, attr);
-        return model.save();
+        const fields = model.changed();
+        if (!Array.isArray(fields) || !fields.length)
+            return model;
+        try {
+            return await model.save();
+        }
+        catch (e) {
+            Object.assign(model, model.previous());
+            throw e;
+        }
     };
     /**
      * Restful add(C of CRUD) for create a resource

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

@@ -0,0 +1,14 @@
+import * as TypeORM from "typeorm";
+interface Cnf {
+    typeorm: {
+        [propName: string]: Parameters<typeof TypeORM.createConnection>[0];
+    };
+}
+interface Deps {
+    TypeORM: typeof TypeORM;
+}
+export declare function Main(cnf: Cnf, deps: Deps): Promise<{
+    [propName: string]: TypeORM.Connection;
+}>;
+export declare const Deps: string[];
+export {};

package/dist/deps/typeorm/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Deps = exports.Main = void 0;
+async function Main(cnf, deps) {
+    // 这里之所以要注入 Sequelize 是为了保证项目自身可以灵活选择自己的 Sequelize 版本, 这样改公共模块就会更加稳定, 避免频繁升级
+    const { typeorm: dbs } = cnf;
+    const { TypeORM } = deps;
+    const links = {};
+    for await (const k of Object.keys(dbs)) {
+        const db = dbs[k];
+        links[k] = await TypeORM.createConnection(db);
+    }
+    return links;
+}
+exports.Main = Main;
+exports.Deps = ["TypeORM"];

package/dist/http/defines.d.ts

@@ -22,6 +22,8 @@ export interface Profile {
     userAgent: string;
     startedAt: Date;
     requestId: string;
+    /** 自由挂载信息的节点 */
+    extra: Record<string, any>;
     revision?: string;
     uuid?: string;
     token?: string;

package/dist/http/router.d.ts

@@ -11,11 +11,15 @@ interface Deps {
     apisRoute?: string;
     swagger?: [any, any];
 }
+/** 对 params 的处理函数 */
+declare type Handler = (params: any) => void;
+/** 对执行结构的处理 */
+declare type ResHandler = (results: any, res: restify.Response) => void;
 export declare function Router(deps: Deps): {
-    get: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Function | undefined, resHandler?: Function | undefined) => void;
-    post: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Function | undefined, resHandler?: Function | undefined) => void;
-    put: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Function | undefined, resHandler?: Function | undefined) => void;
-    del: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Function | undefined, resHandler?: Function | undefined) => void;
+    get: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
+    post: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
+    put: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
+    del: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
 } & {
     collection: (res: string, _routePath?: string | undefined, controller?: string | undefined) => void;
     model: (res: string, routePath?: string) => void;

package/dist/http/utils.js

@@ -49,6 +49,7 @@ function Utils(cnf) {
                 userAgent: req.userAgent(),
                 startedAt: new Date(),
                 requestId: req.id(),
+                extra: {},
             };
             const token = req.headers["x-auth-token"] || req.query.access_token || req.query.accessToken;
             // token 和签名认证只能二选一

package/package.json

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