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

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

@@ -1,11 +1,11 @@
-import { Redis } from "ioredis";
+import { Redis, RedisOptions } from "ioredis";
 import { LRUCache } from "lru-cache";
 export interface CnfDef {
     cache: {
         isMulti?: boolean;
         delSignalChannel?: string;
     } & LRUCache.Options<{}, {}, unknown>;
-    redis?: any;
+    redis?: RedisOptions;
 }
 export interface DepsDef {
     IORedis: typeof Redis;

package/dist/deps/cache/index.js

@@ -40,7 +40,7 @@ function Main(cnf, deps) {
     const needToBroad = Boolean(cnf.cache.isMulti);
     // 如果不是多节点分部署部署，则不需要处理
     // 开启多节点分布式部署后，要通过redis广播cache的del事件，依次来保持cache的有效性
-    if (needToBroad) {
+    if (needToBroad && cnf.redis) {
         const pub = new IORedis(cnf.redis);
         const sub = new IORedis(cnf.redis);
         const { delSignalChannel = "LRU_DEL_SIGNAL_CHANNEL" } = cnf.cache;

package/dist/index.d.ts

@@ -1,17 +1,17 @@
 import { Defaults } from "./defaults";
 import Deps = require("./deps/defines");
-import type { CnfDef as CacheCnfDef } from "./deps/cache";
+export { Errors } from "./Errors";
 export { Main as Cfg } from "./cfg";
 export * as DM from "./dm";
-export { Errors } from "./Errors";
 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;
+export type Feature = keyof typeof Deps;
 /**
  * 获取模块配置类型
  */
-type ModuleConfig<T extends keyof TDeps> = T extends "cache" ? CacheCnfDef : TDeps[T]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {};
+type ModuleConfig<T extends keyof TDeps> = Parameters<TDeps[T]["Main"]>[0];
 /**
  * 获取模块返回类型
  */
@@ -19,8 +19,8 @@ type ModuleReturn<T extends keyof TDeps> = ReturnType<TDeps[T]["Main"]>;
 /**
  * 合并多个模块的配置类型（可选）
  */
-type MergeConfigs<T extends readonly (keyof TDeps)[]> = {
-    [K in T[number]]?: ModuleConfig<K>;
+type Merge<T> = {
+    [k in keyof T]: T[k];
 };
 /**
  * 合并多个模块的返回类型
@@ -28,4 +28,4 @@ type MergeConfigs<T extends readonly (keyof TDeps)[]> = {
 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;
+export declare function Main<T extends Feature[] | Readonly<Feature[]> | ReadonlyArray<Feature>>(features: T): (cnf?: Merge<ModuleConfig<T[number]>>) => MergeReturns<T> & Defaults;

package/dist/index.js

@@ -36,17 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.basicErrors = exports.utils = exports.Http = exports.Errors = exports.DM = exports.Cfg = void 0;
+exports.basicErrors = exports.utils = exports.Http = exports.DM = exports.Cfg = exports.Errors = void 0;
 exports.Main = Main;
 const lodash_1 = __importDefault(require("lodash"));
 const defaults_1 = require("./defaults");
 const DM = __importStar(require("./dm"));
 const Deps = require("./deps/defines");
+// 显式导入 cache 模块的类型定义
+var Errors_1 = require("./Errors");
+Object.defineProperty(exports, "Errors", { enumerable: true, get: function () { return Errors_1.Errors; } });
 var cfg_1 = require("./cfg");
 Object.defineProperty(exports, "Cfg", { enumerable: true, get: function () { return cfg_1.Main; } });
 exports.DM = __importStar(require("./dm"));
-var Errors_1 = require("./Errors");
-Object.defineProperty(exports, "Errors", { enumerable: true, get: function () { return Errors_1.Errors; } });
 var http_1 = require("./http");
 Object.defineProperty(exports, "Http", { enumerable: true, get: function () { return http_1.Main; } });
 exports.utils = __importStar(require("./utils"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {