@domain.js/main 0.1.9 → 0.1.13

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

package/dist/cfg/index.js

@@ -1,9 +1,31 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const _ = require("lodash");
-const ajv_1 = require("ajv");
-const ajv_formats_1 = require("ajv-formats");
+const _ = __importStar(require("lodash"));
+const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
 function Main(object, schema) {
     if (typeof schema !== "object")
         throw Error("object type isnt an object");

package/dist/cli/index.js

@@ -1,10 +1,29 @@
 #! /usr/bin/env node
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path = require("path");
-const readline = require("readline");
 const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const readline = __importStar(require("readline"));
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -16,7 +35,7 @@ rl.setPrompt("> ");
 const _require = require;
 const showMessage = (msg, exit) => {
     rl.write(`${msg}\n`);
-    if (exit != null)
+    if (exit)
         process.exit(exit);
     rl.setPrompt("> ");
 };
@@ -34,8 +53,8 @@ const makeDefineFile = async (modules, targetFile, isTS) => {
     const dirname = path.dirname(targetFile);
     const content = ["// domain-cli 自动生成"];
     const _exports = [];
-    for (let i = 0; i < modules.length; i += 1) {
-        const name = path.relative(dirname, modules[i]);
+    for (const x of modules) {
+        const name = path.relative(dirname, x);
         const variable = filePath2Var(name);
         if (isTS) {
             content.push(`import * as ${variable} from "./${name}"`);

package/dist/defaults.d.ts

@@ -1,16 +1,16 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import * as uuid from "uuid";
 import * as ajv from "ajv";
 import * as ajvFormats from "ajv-formats";
 import * as async from "async";
 import * as axios from "axios";
 import * as cronParser from "cron-parser";
-import humanInterval = require("human-interval");
+import humanInterval from "human-interval";
 import * as IORedis from "ioredis";
-import * as LRU from "lru-cache";
+import LRU from "lru-cache";
 import * as mysql from "mysql2";
 import * as Sequelize from "sequelize";
-import * as moment from "moment";
+import moment from "moment";
 import * as utils from "./utils";
 import { errors } from "./basic-errors";
 /** npm packages injection */

package/dist/defaults.js

@@ -1,35 +1,57 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaults = void 0;
-const _ = require("lodash");
-const uuid = require("uuid");
-const ajv = require("ajv");
-const ajvFormats = require("ajv-formats");
-const async = require("async");
-const axios = require("axios");
-const cronParser = require("cron-parser");
-const humanInterval = require("human-interval");
-const IORedis = require("ioredis");
-const LRU = require("lru-cache");
-const mysql = require("mysql2");
-const Sequelize = require("sequelize");
-const moment = require("moment");
-const utils = require("./utils");
+const lodash_1 = __importDefault(require("lodash"));
+const uuid = __importStar(require("uuid"));
+const ajv = __importStar(require("ajv"));
+const ajvFormats = __importStar(require("ajv-formats"));
+const async = __importStar(require("async"));
+const axios = __importStar(require("axios"));
+const cronParser = __importStar(require("cron-parser"));
+const human_interval_1 = __importDefault(require("human-interval"));
+const IORedis = __importStar(require("ioredis"));
+const lru_cache_1 = __importDefault(require("lru-cache"));
+const mysql = __importStar(require("mysql2"));
+const Sequelize = __importStar(require("sequelize"));
+const moment_1 = __importDefault(require("moment"));
+const utils = __importStar(require("./utils"));
 const basic_errors_1 = require("./basic-errors");
 exports.defaults = {
-    _,
+    _: lodash_1.default,
     uuid,
     ajv,
     ajvFormats,
     async,
     axios,
     cronParser,
-    humanInterval,
+    humanInterval: human_interval_1.default,
     IORedis,
-    LRU,
+    LRU: lru_cache_1.default,
     mysql,
     Sequelize,
-    moment,
+    moment: moment_1.default,
     utils,
     U: utils,
     errors: basic_errors_1.errors,

package/dist/deps/aes/index.js

@@ -1,8 +1,27 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const cryptojs = require("crypto-js/core");
-const AES = require("crypto-js/aes");
+const cryptojs = __importStar(require("crypto-js/core"));
+const AES = __importStar(require("crypto-js/aes"));
 function Main() {
     // aes-256-cbc encrypt
     const encrypt = (message, key) => AES.encrypt(message, key).toString();

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

@@ -1,5 +1,5 @@
-import * as LRU from "lru-cache";
-import * as Redis from "ioredis";
+import LRU from "lru-cache";
+import Redis from "ioredis";
 import { SetRequired } from "type-fest";
 export interface CnfDef {
     cache?: {

package/dist/deps/defines.js

@@ -1,36 +1,55 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 // domain-cli 自动生成
-const aes = require("./aes");
-const cache = require("./cache");
-const checker = require("./checker");
-const counter = require("./counter");
-const cron = require("./cron");
-const graceful = require("./graceful");
-const hash = require("./hash");
-const logger = require("./logger");
-const myCia = require("./myCia");
-const parallel = require("./parallel");
-const redis = require("./redis");
-const request = require("./request");
-const rest = require("./rest");
-const schema = require("./schema");
-const sequelize = require("./sequelize");
-const signer = require("./signer");
+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 graceful = __importStar(require("./graceful"));
+const hash = __importStar(require("./hash"));
+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,
-    cache,
-    checker,
-    counter,
-    cron,
-    graceful,
-    hash,
-    logger,
-    myCia,
-    parallel,
-    redis,
-    request,
-    rest,
-    schema,
-    sequelize,
-    signer,
+    aes: aes,
+    cache: cache,
+    checker: checker,
+    counter: counter,
+    cron: cron,
+    graceful: graceful,
+    hash: hash,
+    logger: logger,
+    myCia: myCia,
+    parallel: parallel,
+    redis: redis,
+    request: request,
+    rest: rest,
+    schema: schema,
+    sequelize: sequelize,
+    signer: signer,
 };

package/dist/deps/graceful/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const process = require("process");
+const process = __importStar(require("process"));
 function Graceful(info) {
     let exiting = false; // 是否正在退出
     const callbacks = [];

package/dist/deps/logger/index.js

@@ -1,8 +1,27 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
 function Main(cnf, deps) {
     const { logger: { errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;

package/dist/deps/myCia/errors.js

@@ -1,6 +1,25 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const util = require("util");
+const util = __importStar(require("util"));
 exports.default = () => {
     const defines = [
         ["duplicatRegistMessage", "The message has been registed: %s"],

package/dist/deps/myCia/index.js

@@ -1,7 +1,10 @@
 "use strict";
+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;
-const errors_1 = require("./errors");
+const errors_1 = __importDefault(require("./errors"));
 function Main(cnf, deps) {
     const { _, async, uuid: { v4: uuid }, logger, redis, graceful, U: { tryCatchLog }, } = deps;
     const { cia } = cnf;

package/dist/deps/parallel/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const utils = require("../../utils");
+const utils = __importStar(require("../../utils"));
 /**
  * Parallel control module
  * @param cnf Module initialization configuration parameters

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

@@ -1,4 +1,4 @@
-import * as Redis from "ioredis";
+import Redis from "ioredis";
 interface Cnf {
     redis: Redis.RedisOptions;
 }

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

@@ -1,4 +1,4 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import * as Sequelize from "sequelize";
 import { TModel, Params } from "./defines";
 import { Stats } from "./stats";

package/dist/deps/rest/index.js

@@ -1,7 +1,10 @@
 "use strict";
+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;
-const _ = require("lodash");
+const lodash_1 = __importDefault(require("lodash"));
 const stats_1 = require("./stats");
 var Before_1 = require("./Before");
 Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
@@ -24,14 +27,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
@@ -54,7 +66,7 @@ function Main(cnf, deps, utils) {
             return Model.create(attr);
         // 如果设置了唯一属性，且开启了回收站功能
         // 则判断是否需要执行恢复操作
-        const where = _.pick(attr, Model.unique);
+        const where = lodash_1.default.pick(attr, Model.unique);
         // 根据条件查找资源
         const model = await Model.findOne({ where });
         // 资源不存在
@@ -101,7 +113,7 @@ function Main(cnf, deps, utils) {
         // 提高查询速度
         let count = 0;
         if (_ignoreTotal !== "yes")
-            count = await Model.count(_.pick(opt, COUNT_OPT));
+            count = await Model.count(lodash_1.default.pick(opt, COUNT_OPT));
         if (Array.isArray(allowAttrs) && allowAttrs.length)
             opt.attributes = allowAttrs;
         const rows = (await Model.findAll(opt));

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

@@ -1,4 +1,4 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import * as Sequelize from "sequelize";
 import { Params, ModelExtraAtts, TModel } from "./defines";
 import { Utils } from "./utils";

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

@@ -1,7 +1,7 @@
-import * as _ from "lodash";
+import type { LoDashStatic } from "lodash";
 import * as mysql from "mysql2";
 import * as Sequelize from "sequelize";
-import * as moment from "moment";
+import moment from "moment";
 import { ModelExtraAtts, TModel, Params } from "./defines";
 interface Cnf {
     rest: {
@@ -9,7 +9,7 @@ interface Cnf {
     };
 }
 interface Deps {
-    _: typeof _;
+    _: LoDashStatic;
     mysql: Pick<typeof mysql, "escape">;
     moment: typeof moment extends (...args: infer A) => infer B ? (...args: A) => B : never;
     Sequelize: Pick<typeof Sequelize, "where" | "fn" | "col" | "literal" | "Op">;

package/dist/deps/rest/utils.js

@@ -1,11 +1,29 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
-const _ = require("lodash");
-const mysql = require("mysql2");
+const mysql = __importStar(require("mysql2"));
 function Utils(cnf, deps) {
     const { rest: { relativeMaxRangeDays: RELATIVE_MAX_RANGE = 100 }, } = cnf;
-    const { errors, moment, Sequelize } = deps;
+    const { _, errors, moment, Sequelize } = deps;
     /**
      * 相对多少天的时间
      * @param Number days 相对多少天

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

@@ -20,7 +20,7 @@ export declare function Main(cnf: Cnf, deps: Deps): Readonly<{
     validate: (schema: Schema, data: any) => boolean;
     compile: (schema: Schema) => ajv.ValidateFunction<unknown>;
     /** intance of Ajv */
-    ajv: ajv.default;
+    ajv: import("ajv").default;
 }>;
 export declare const Deps: string[];
 export {};

package/dist/deps/schema/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const util = require("util");
+const util = __importStar(require("util"));
 /**
  * JSON schema validation module, based on Ajv: https://www.npmjs.com/package/ajv
  * @param cnf Ajv initialization parameters

package/dist/deps/signer/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const crypto = require("crypto");
+const crypto = __importStar(require("crypto"));
 /**
  * API interface encryption signature algorithm module, based on sha256
  * @returns generator And request Methods

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/dm/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.auto = exports.exec = void 0;
-const _ = require("lodash");
+const _ = __importStar(require("lodash"));
 /**
  * Initialize a module
  * @param Main The function is module main function

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/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const restify = require("restify");
+const restify = __importStar(require("restify"));
 const router_1 = require("./router");
 const utils_1 = require("./utils");
 function Main(cnf, deps) {

package/dist/http/router.js

@@ -1,8 +1,27 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
-const _ = require("lodash");
-const errors = require("restify-errors");
+const _ = __importStar(require("lodash"));
+const errors = __importStar(require("restify-errors"));
 function Router(deps) {
     const { domain, apisRoute, getSchemaByPath, utils, server, httpCodes = {}, makeProfileHook, } = deps;
     const { ucwords, makeParams, makeProfile, outputCSV } = utils;

package/dist/http/utils.js

@@ -1,11 +1,30 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
-const os = require("os");
-const fs = require("fs");
-const crypto = require("crypto");
-const _ = require("lodash");
-const xlsx = require("xlsx");
+const os = __importStar(require("os"));
+const fs = __importStar(require("fs"));
+const crypto = __importStar(require("crypto"));
+const _ = __importStar(require("lodash"));
+const xlsx = __importStar(require("xlsx"));
 const csv_stringify_1 = require("csv-stringify");
 const str2arr = ["_includes", "dimensions", "metrics", "_attrs"];
 const enc = encodeURI;
@@ -49,6 +68,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/dist/index.js

@@ -1,15 +1,34 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = exports.basicErrors = exports.Cfg = exports.utils = exports.DM = exports.Errors = exports.Http = void 0;
 const defaults_1 = require("./defaults");
-const DM = require("./dm");
+const DM = __importStar(require("./dm"));
 const Deps = require("./deps/defines");
 var http_1 = require("./http");
 Object.defineProperty(exports, "Http", { enumerable: true, get: function () { return http_1.Main; } });
 var Errors_1 = require("./Errors");
 Object.defineProperty(exports, "Errors", { enumerable: true, get: function () { return Errors_1.Errors; } });
-exports.DM = require("./dm");
-exports.utils = require("./utils");
+exports.DM = __importStar(require("./dm"));
+exports.utils = __importStar(require("./utils"));
 var cfg_1 = require("./cfg");
 Object.defineProperty(exports, "Cfg", { enumerable: true, get: function () { return cfg_1.Main; } });
 exports.basicErrors = defaults_1.defaults.errors;

package/dist/utils/index.js

@@ -1,7 +1,26 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modifiyURL = exports.inExpired = exports.tryCatchLog = exports.deepFreeze = exports.sleep = exports.lcfirst = exports.ucfirst = exports.nt2space = exports.randStr = exports.md5 = void 0;
-const crypto = require("crypto");
+const crypto = __importStar(require("crypto"));
 /** 随机字符串字典 */
 const RAND_STR_DICT = {
     normal: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.1.9",
+  "version": "0.1.13",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -18,25 +18,28 @@
   "author": "Redstone Zhao",
   "license": "MIT",
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.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"]