@domain.js/main 0.1.3 → 0.1.5

package/.husky/pre-commit

@@ -4,4 +4,4 @@ if [ ! -f "$(dirname "$0")/_/husky.sh" ]; then
 fi
 . "$(dirname "$0")/_/husky.sh"
 
-ts-node src/cli/index.ts loadDeps ./ 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 

package/dist/cli/index.js

@@ -79,7 +79,7 @@ const checkHookExport = (_dir) => {
 const loadDeps = async (rootDir = process.cwd(), ext = "js") => {
     const isTS = ext === "ts";
     const modules = [];
-    const dir = path.resolve(rootDir, "src/deps/");
+    const dir = path.resolve(rootDir, "./");
     for (const x of fs.readdirSync(dir)) {
         // 忽略隐藏目录
         if (x[0] === ".")
@@ -93,7 +93,7 @@ const loadDeps = async (rootDir = process.cwd(), ext = "js") => {
         modules.push(x);
     }
     // 按字典排序，后续有变动的时候不容易冲突
-    const targetFile = path.resolve(rootDir, `src/deps/defines.${ext}`);
+    const targetFile = path.resolve(rootDir, `./defines.${ext}`);
     await makeDefineFile(modules.sort(), targetFile, isTS);
 };
 const checkService = (_dir) => {
@@ -106,7 +106,7 @@ const checkService = (_dir) => {
 const loadServices = async (rootDir = process.cwd(), ext = "js") => {
     const isTS = ext === "ts";
     const modules = [];
-    const dir = path.resolve(rootDir, "src/services/");
+    const dir = path.resolve(rootDir, "domain/services/");
     for (const x of fs.readdirSync(dir)) {
         // 忽略隐藏目录, 忽略私有目录
         if (x[0] === "." || x[0] === "_")
@@ -120,7 +120,7 @@ const loadServices = async (rootDir = process.cwd(), ext = "js") => {
         modules.push(x);
     }
     // 按字典排序，后续有变动的时候不容易冲突
-    const targetFile = path.resolve(rootDir, `src/services/defines.${ext}`);
+    const targetFile = path.resolve(rootDir, `domain/services/defines.${ext}`);
     await makeDefineFile(modules.sort(), targetFile, isTS);
 };
 const deepLoadDir = (root, parent, files = []) => {

package/dist/cli/schema2ts.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli/schema2ts.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const fs = require("fs");
+const json_schema_to_typescript_1 = require("json-schema-to-typescript");
+const _require = require;
+async function main(file, single = false, name = "Params") {
+    const stats = fs.statSync(file);
+    if (stats.isFile()) {
+        const arr = file.split(".");
+        if (arr.pop() !== "js")
+            return;
+        const obj = _require(file);
+        if (!single) {
+            if (!Array.isArray(obj))
+                return;
+            if (typeof obj[1] !== "object")
+                return;
+        }
+        try {
+            const ts = await (0, json_schema_to_typescript_1.compile)(single ? obj : obj[1], name);
+            arr.push("d.ts");
+            fs.writeFileSync(arr.join("."), ts);
+        }
+        catch (e) {
+            console.error(file, e);
+        }
+        return;
+    }
+    const files = fs.readdirSync(file);
+    for await (const x of files) {
+        if (x === "." || x === "..")
+            continue;
+        await main(path.resolve(file, x), single, name);
+    }
+}
+main(process.argv[2], process.argv[3] === "single", process.argv[4]);

package/dist/dm/index.d.ts

@@ -1,6 +1,6 @@
 interface ModuleInterface {
     Main: (...args: any[]) => any;
-    Deps?: string[];
+    Deps?: string[] | ReadonlyArray<string>;
     Before?: (...args: any[]) => any;
     After?: (...args: any[]) => void;
 }

package/dist/types/index.d.ts

@@ -0,0 +1 @@
+export declare type ReadonlyArray2union<T extends ReadonlyArray<any>> = T extends ReadonlyArray<infer A> ? A : never;

package/dist/types/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@domain.js/main",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "DDD framework",
   "main": "dist/index.js",
-  "bin": "dist/cli/index.js",
+  "bin": {
+    "domain-cli": "dist/cli/index.js"
+  },
   "scripts": {
     "build": "tsc",
     "test": "export NODE_ENV=test && jest ./src --coverage",
@@ -66,13 +68,14 @@
     "csv-stringify": "^6.0.2",
     "human-interval": "^2.0.1",
     "ioredis": "^4.28.0",
+    "json-schema-to-typescript": "^10.1.5",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "moment": "^2.29.1",
     "mysql2": "^2.3.3",
     "restify": "^8.6.0",
     "restify-errors": "^8.0.2",
-    "sequelize": "^6.9.0",
+    "sequelize": "6.12.1",
     "swagger-ui-restify": "^3.0.8",
     "type-fest": "^2.8.0",
     "uuid": "^8.3.2",