@domain.js/main 0.1.6 → 0.1.10

package/.husky/pre-commit

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

package/dist/cli/index.js

@@ -31,10 +31,11 @@ const codeStyleFormat = (targetFile) => new Promise((resolve, reject) => {
     });
 });
 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 = modules[i];
+        const name = path.relative(dirname, modules[i]);
         const variable = filePath2Var(name);
         if (isTS) {
             content.push(`import * as ${variable} from "./${name}"`);
@@ -76,7 +77,7 @@ const checkHookExport = (_dir) => {
         }
     }
 };
-const loadDeps = async (rootDir = process.cwd(), ext = "js") => {
+const loadDeps = async (rootDir, ext = "js") => {
     const isTS = ext === "ts";
     const modules = [];
     const dir = path.resolve(rootDir, "./");
@@ -90,7 +91,7 @@ const loadDeps = async (rootDir = process.cwd(), ext = "js") => {
         if (!stat.isDirectory())
             continue;
         checkHookExport(_dir);
-        modules.push(x);
+        modules.push(path.join(dir, x));
     }
     // 按字典排序，后续有变动的时候不容易冲突
     const targetFile = path.resolve(rootDir, `./defines.${ext}`);
@@ -106,7 +107,7 @@ const checkService = (_dir) => {
 const loadServices = async (rootDir = process.cwd(), ext = "js") => {
     const isTS = ext === "ts";
     const modules = [];
-    const dir = path.resolve(rootDir, "domain/services/");
+    const dir = path.resolve(rootDir, "src/domain/services/");
     for (const x of fs.readdirSync(dir)) {
         // 忽略隐藏目录, 忽略私有目录
         if (x[0] === "." || x[0] === "_")
@@ -117,81 +118,55 @@ const loadServices = async (rootDir = process.cwd(), ext = "js") => {
         if (!stat.isDirectory())
             continue;
         checkService(_dir);
-        modules.push(x);
+        modules.push(path.join(dir, x));
     }
     // 按字典排序，后续有变动的时候不容易冲突
-    const targetFile = path.resolve(rootDir, `domain/services/defines.${ext}`);
+    const targetFile = path.resolve(rootDir, `src/domain/services/defines.${ext}`);
     await makeDefineFile(modules.sort(), targetFile, isTS);
 };
-const deepLoadDir = (root, parent, files = []) => {
-    const paths = {};
-    const dir = path.resolve(root, parent);
+/**
+ * 尝试读取目录下的文件
+ * @param dir 目录路径
+ * @param list 读取到schema后压入改列表
+ */
+const tryReadSchemas = (dir, list, isTS = false) => {
+    if (!fs.existsSync(dir))
+        return;
+    const stat = fs.statSync(dir);
+    if (stat.isFile())
+        return;
     for (const x of fs.readdirSync(dir)) {
-        // 忽略隐藏目录
-        if (x[0] === ".")
+        if (x.startsWith("."))
             continue;
-        const file = path.resolve(dir, x);
-        const stat = fs.statSync(file);
-        const { name, ext } = path.parse(x);
-        const relativeFilePath = `./${path.join(parent, name)}`;
-        const moduleName = file2Module(name);
-        // 如果是文件则记录
-        if (stat.isFile()) {
-            if (ext === ".ts") {
-                const JSFile = path.resolve(dir, `${name}.js`);
-                // 对应的js文件存在，则ts文件忽略
-                if (fs.existsSync(JSFile))
-                    continue;
-                // 对应的js文件不存在，抛出异常提示用户要先编译
-                throw Error(`请先编译ts文件: ${file}`);
-            }
-            files.push(relativeFilePath);
-            paths[moduleName] = relativeFilePath;
+        const ext = path.extname(x);
+        if (isTS && ext !== ".ts")
             continue;
-        }
-        if (stat.isDirectory()) {
-            paths[moduleName] = deepLoadDir(root, relativeFilePath, files);
-        }
+        if (!isTS && ext !== ".js")
+            continue;
+        list.push(path.join(dir, path.basename(x, isTS ? ".ts" : ".js")));
     }
-    return paths;
 };
-const deepLoadModule = async (rootDir, targetFile) => {
-    const files = [];
-    const paths = deepLoadDir(rootDir, "./", files);
-    const { ext } = path.parse(targetFile);
-    // 按字典排序，后续有变动的时候不容易冲突
-    files.sort();
-    const relative = path.relative(path.dirname(targetFile), rootDir);
-    const isTS = ext === ".ts";
-    const content = ["// domain-cli 自动生成"];
-    for (let i = 0; i < files.length; i += 1) {
-        const name = files[i];
-        const _path = `./${path.join(relative, name)}`;
-        const variable = filePath2Var(name);
-        if (isTS) {
-            content.push(`import * as ${variable} from "${_path}"`);
-        }
-        else {
-            content.push(`const ${variable} = require("${_path}")`);
-        }
-    }
-    // 处理导出
-    content.push("\n");
-    let _exports = JSON.stringify(paths, null, 2);
-    for (let i = 0; i < files.length; i += 1) {
-        _exports = _exports.replace(`"${files[i]}"`, filePath2Var(files[i]));
-    }
-    if (isTS) {
-        content.push(`export = ${_exports}`);
-    }
-    else {
-        content.push(`module.exports = ${_exports}`);
+const loadSchemas = async (rootDir = process.cwd(), ext = "js") => {
+    const isTS = ext === "ts";
+    const modules = [];
+    const dir = path.resolve(rootDir, "src/domain/services/");
+    for (const x of fs.readdirSync(dir)) {
+        // 忽略隐藏目录, 忽略私有目录
+        if (x[0] === "." || x[0] === "_")
+            continue;
+        const _dir = path.resolve(dir, x);
+        const stat = fs.statSync(_dir);
+        // 非目录忽略，模块必须是目录
+        if (!stat.isDirectory())
+            continue;
+        // 尝试读取子目录里的 schemas 目录
+        tryReadSchemas(path.join(_dir, "schemas"), modules, isTS);
     }
-    fs.writeFileSync(targetFile, content.join("\n"));
-    await codeStyleFormat(targetFile);
-    console.log(`Completed: ${targetFile}`);
+    // 按字典排序，后续有变动的时候不容易冲突
+    const targetFile = path.resolve(rootDir, `src/domain/services/schemas.${ext}`);
+    await makeDefineFile(modules.sort(), targetFile, isTS);
 };
-const actions = { loadDeps, loadServices, deepLoadModule };
+const actions = { loadDeps, loadServices, loadSchemas };
 const main = async (command) => {
     const action = actions[command];
     if (!action) {

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

@@ -19,7 +19,7 @@ function Main(cnf, deps) {
         const d = r.data;
         if (typeof d === "string")
             return [r.status, d];
-        return [d.code || r.status, d.message || r.statusText];
+        return [d.code || r.status, d.message || JSON.stringify(d)];
     })().join("\t");
     if (!cnf.axios)
         cnf.axios = {};

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

@@ -17,7 +17,7 @@ const md5 = (str) => {
     return hash.update(str.toString()).digest().toString("hex");
 };
 exports.md5 = md5;
-function randStr(len, type) {
+function randStr(len, type = "normal") {
     const dict = type === "strong" || type === "normal" ? RAND_STR_DICT[type] : type;
     const { length } = dict;
     /** 随机字符串的长度不能等于 0 或者负数 */

package/package.json

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