@domain.js/main 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { Defaults } from "./defaults";
 import Deps = require("./deps/defines");
+import type { CnfDef as CacheCnfDef } from "./deps/cache";
 export { Main as Cfg } from "./cfg";
 export * as DM from "./dm";
 export { Errors } from "./Errors";
@@ -7,80 +8,24 @@ export { Main as Http } from "./http";
 export * as utils from "./utils";
 export declare const basicErrors: Readonly<Record<"notFound" | "notAllowed" | "noAuth", import("./Errors").ErrorFn>>;
 type TDeps = typeof Deps;
-type Merge<T> = {
-    [k in keyof T]: T[k];
+/**
+ * 获取模块配置类型
+ */
+type ModuleConfig<T extends keyof TDeps> = T extends "cache" ? CacheCnfDef : TDeps[T]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {};
+/**
+ * 获取模块返回类型
+ */
+type ModuleReturn<T extends keyof TDeps> = ReturnType<TDeps[T]["Main"]>;
+/**
+ * 合并多个模块的配置类型（可选）
+ */
+type MergeConfigs<T extends readonly (keyof TDeps)[]> = {
+    [K in T[number]]?: ModuleConfig<K>;
 };
 /**
- * Include from T those types that are assignable to U
+ * 合并多个模块的返回类型
  */
-type Include<T, U> = T extends U ? T : never;
-type RemoveReadonlyArray<T> = T extends ReadonlyArray<infer T1> ? T1 : false;
-export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T): (cnf: Merge<{
-    aes: typeof import("./deps/aes");
-    cache: typeof import("./deps/cache");
-    checker: typeof import("./deps/checker");
-    counter: typeof import("./deps/counter");
-    cron: typeof import("./deps/cron");
-    frequency: typeof import("./deps/frequency");
-    graceful: typeof import("./deps/graceful");
-    hash: typeof import("./deps/hash");
-    logger: typeof import("./deps/logger");
-    myCia: typeof import("./deps/myCia");
-    parallel: typeof import("./deps/parallel");
-    redis: typeof import("./deps/redis");
-    rest: typeof import("./deps/rest");
-    schema: typeof import("./deps/schema");
-    sequelize: typeof import("./deps/sequelize");
-    signer: typeof import("./deps/signer");
-}[Include<"frequency", RemoveReadonlyArray<T>> | Include<"schema", RemoveReadonlyArray<T>> | Include<"logger", RemoveReadonlyArray<T>> | Include<"hash", RemoveReadonlyArray<T>> | Include<"aes", RemoveReadonlyArray<T>> | Include<"redis", RemoveReadonlyArray<T>> | Include<"sequelize", RemoveReadonlyArray<T>> | Include<"counter", RemoveReadonlyArray<T>> | Include<"cron", RemoveReadonlyArray<T>> | Include<"myCia", RemoveReadonlyArray<T>> | Include<"graceful", RemoveReadonlyArray<T>> | Include<"parallel", RemoveReadonlyArray<T>> | Include<"cache", RemoveReadonlyArray<T>> | Include<"rest", RemoveReadonlyArray<T>> | Include<"checker", RemoveReadonlyArray<T>> | Include<"signer", RemoveReadonlyArray<T>>]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {}>) => (Pick<{
-    aes: typeof import("./deps/aes");
-    cache: typeof import("./deps/cache");
-    checker: typeof import("./deps/checker");
-    counter: typeof import("./deps/counter");
-    cron: typeof import("./deps/cron");
-    frequency: typeof import("./deps/frequency");
-    graceful: typeof import("./deps/graceful");
-    hash: typeof import("./deps/hash");
-    logger: typeof import("./deps/logger");
-    myCia: typeof import("./deps/myCia");
-    parallel: typeof import("./deps/parallel");
-    redis: typeof import("./deps/redis");
-    rest: typeof import("./deps/rest");
-    schema: typeof import("./deps/schema");
-    sequelize: typeof import("./deps/sequelize");
-    signer: typeof import("./deps/signer");
-}, RemoveReadonlyArray<T>> extends infer T_1 extends Pick<{
-    aes: typeof import("./deps/aes");
-    cache: typeof import("./deps/cache");
-    checker: typeof import("./deps/checker");
-    counter: typeof import("./deps/counter");
-    cron: typeof import("./deps/cron");
-    frequency: typeof import("./deps/frequency");
-    graceful: typeof import("./deps/graceful");
-    hash: typeof import("./deps/hash");
-    logger: typeof import("./deps/logger");
-    myCia: typeof import("./deps/myCia");
-    parallel: typeof import("./deps/parallel");
-    redis: typeof import("./deps/redis");
-    rest: typeof import("./deps/rest");
-    schema: typeof import("./deps/schema");
-    sequelize: typeof import("./deps/sequelize");
-    signer: typeof import("./deps/signer");
-}, RemoveReadonlyArray<T>> ? { [k in keyof T_1]: ReturnType<Pick<{
-    aes: typeof import("./deps/aes");
-    cache: typeof import("./deps/cache");
-    checker: typeof import("./deps/checker");
-    counter: typeof import("./deps/counter");
-    cron: typeof import("./deps/cron");
-    frequency: typeof import("./deps/frequency");
-    graceful: typeof import("./deps/graceful");
-    hash: typeof import("./deps/hash");
-    logger: typeof import("./deps/logger");
-    myCia: typeof import("./deps/myCia");
-    parallel: typeof import("./deps/parallel");
-    redis: typeof import("./deps/redis");
-    rest: typeof import("./deps/rest");
-    schema: typeof import("./deps/schema");
-    sequelize: typeof import("./deps/sequelize");
-    signer: typeof import("./deps/signer");
-}, RemoveReadonlyArray<T>>[k]["Main"]>; } : never) & Defaults;
+type MergeReturns<T extends readonly (keyof TDeps)[]> = {
+    [K in T[number]]: ModuleReturn<K>;
+};
+export declare function Main<T extends readonly (keyof TDeps)[]>(features: T): (cnf?: MergeConfigs<T>) => MergeReturns<T> & Defaults;

package/dist/index.js

@@ -52,7 +52,7 @@ Object.defineProperty(exports, "Http", { enumerable: true, get: function () { re
 exports.utils = __importStar(require("./utils"));
 exports.basicErrors = defaults_1.defaults.errors;
 function Main(features) {
-    return (cnf) => {
+    return (cnf = {}) => {
         /** 这里之所以要浅拷贝，是为了避免多次初始化之间互相干扰 */
         const _deps = { ...defaults_1.defaults };
         const modules = DM.auto(lodash_1.default.pick(Deps, features) /** 要启用的内部模块 */, _deps /** 初始的模块依赖对象 */, [cnf, _deps] /** 内部模块初始化参数 */);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -57,8 +57,8 @@
     "@types/async": "^3.2.25",
     "@types/lodash": "^4.17.20",
     "@types/validator": "^13.7.0",
-    "ajv": "^8.8.1",
-    "ajv-formats": "^2.1.1",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "ajv-keywords": "^5.1.0",
     "async": "^3.2.6",
     "cron-parser": "^4.1.0",