@domain.js/main 0.1.8 → 0.1.12

package/.eslintrc.js

@@ -1,67 +1,32 @@
 module.exports = {
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint"],
-  extends: ["airbnb", "eslint:recommended", "plugin:@typescript-eslint/recommended"],
-  ignorePatterns: [".eslintrc.js"],
-  root: true,
+  parser: "@typescript-eslint/parser", // 解析ts 代码编译器，将ts 语法树转化为 eslint 期望的
+  extends: ["alloy", "alloy/typescript"],
+  plugins: ["simple-import-sort", "unused-imports"],
   env: {
-    es6: true,
+    // Your environments (which contains several predefined global variables)
+    //
     node: true,
-    jest: true,
+    commonjs: true,
+    es6: true,
   },
-  settings: {
-    react: {
-      version: "999.999.999",
-    },
+  globals: {
+    // Your global variables (setting to false means it's not allowed to be reassigned)
+    //
+    // myGlobal: false
   },
   rules: {
-    "nonblock-statement-body-position": "off",
-    "operator-linebreak": ["error", "after"],
-    "prefer-destructuring": ["error", { object: true, array: true }],
-    indent: ["error", 2],
-    "no-use-before-define": ["error", { functions: true, classes: true, variables: true }],
-    "no-param-reassign": 0,
-    "no-continue": 0,
-    "no-console": 0,
-    "no-debugger": 1,
-    "no-var": 1,
-    semi: ["error", "always"],
-    "no-trailing-spaces": "error",
-    "eol-last": 1,
-    "no-underscore-dangle": 0,
-    "no-empty": "error",
-    "no-loop-func": "error",
-    "no-bitwise": "off", // "error",
-    quotes: ["error", "double"],
-    "comma-dangle": ["error", "only-multiline"],
-    "arrow-parens": ["error", "always"],
-    "object-curly-newline": 0,
-    "function-paren-newline": 0,
-    "implicit-arrow-linebreak": 0,
-    curly: 0,
-    "no-mixed-operators": "error",
-    "no-restricted-syntax": 0,
-    "no-lone-blocks": "error",
-    "lines-between-class-members": "off",
-    yoda: "error",
-    "no-plusplus": 0,
-    "import/export": 0,
-    "no-cond-assign": "error",
-    "no-shadow": 0,
-    camelcase: 0,
-    "prefer-destructuring": 0,
-    "import/prefer-default-export": "off",
-    "newline-per-chained-call": 0,
-    "@typescript-eslint/interface-name-prefix": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-namespace": 0,
-    "@typescript-eslint/ban-types": 0,
-    "import/export": 0,
-    "import/no-unresolved": 0,
-    "import/extensions": 0,
-    "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/no-this-alias": 0,
+    // Customize your rules
+    "spaced-comment": "off", // 注释前有空白检查
+    "simple-import-sort/imports": "error", // 优化import 顺序
+    "simple-import-sort/exports": "error", // 优化 export 顺序
+    "no-multiple-empty-lines": ["warn", { max: 2 }], // 强制最大连续空行数为 2
+    complexity: ["error", 20], // https://cn.eslint.org/docs/rules/complexity
+    "no-template-curly-in-string": "error", //禁止在常规字符串中出现模板字面量占位符语法
+    "unused-imports/no-unused-imports": "warn",
+    "@typescript-eslint/explicit-member-accessibility": "off", // 不强制设置类成员的可访问性
+    "@typescript-eslint/member-ordering": "off", // 不严格限制类成员顺序
+    "max-params": ["error", 6], // 函数最多6个参数
+    "@typescript-eslint/no-require-imports": "off", // 部分第三方库不支持  esModuleInterop 编译选项
+    "@typescript-eslint/prefer-optional-chain": "off", // 过多使用可选操作符降低代码可读性 foo?.a?.b?.c
   },
 };

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/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.8",
+  "version": "0.1.12",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -22,21 +22,24 @@
     "@typescript-eslint/parser": "^4.22.0",
     "babel-eslint": "^10.1.0",
     "codecov": "^3.8.3",
-    "eslint": "^7.11.0",
+    "eslint": "^8.8.0",
     "eslint-config-airbnb": "^18.2.0",
+    "eslint-config-alloy": "^4.4.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.21.4",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
     "husky": "^7.0.0",
     "jest": "^27.3.1",
     "lint-staged": "^11.0.0",
     "prettier": "^2.3.0",
     "sequelize-json-schema": "^2.1.1",
     "ts-jest": "^27.0.7",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.2"
+    "ts-node": "^10.5.0",
+    "typescript": "^4.5.5"
   },
   "prettier": {
     "printWidth": 100,

package/tsconfig.json

@@ -6,7 +6,8 @@
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
-    "rootDir": "./src/"
+    "rootDir": "./src/",
+    "esModuleInterop": true
   },
   "include": ["./"],
   "exclude": ["./src/**/*.test.ts", "./src/**/samples/*", "node_modules", "dist"]