@midwayjs/redis 3.5.3 → 3.7.0

package/dist/configuration.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const manager_1 = require("./manager");
 let RedisConfiguration = class RedisConfiguration {
     async onReady(container) {
@@ -19,7 +19,7 @@ let RedisConfiguration = class RedisConfiguration {
     }
 };
 RedisConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'redis',
         importConfigs: [
             {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { RedisConfiguration as Configuration } from './configuration';
 export * from './manager';
+export * from './interface';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -18,4 +18,5 @@ exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.RedisConfiguration; } });
 __exportStar(require("./manager"), exports);
+__exportStar(require("./interface"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -0,0 +1,7 @@
+import * as Redis from 'ioredis';
+import { ClusterNode, ClusterOptions } from 'ioredis';
+export declare type RedisConfigOptions = Redis.RedisOptions | ({
+    cluster?: boolean;
+    nodes?: ClusterNode[];
+} & ClusterOptions);
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/dist/manager.d.ts

@@ -1,7 +1,8 @@
-import { ServiceFactory } from '@midwayjs/core';
+import { ServiceFactory, ServiceFactoryConfigOption } from '@midwayjs/core';
 import Redis from 'ioredis';
+import { RedisConfigOptions } from './interface';
 export declare class RedisServiceFactory extends ServiceFactory<Redis> {
-    redisConfig: any;
+    redisConfig: ServiceFactoryConfigOption<RedisConfigOptions>;
     init(): Promise<void>;
     logger: any;
     createClient(config: any): Promise<Redis>;

package/dist/manager.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisService = exports.RedisServiceFactory = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const ioredis_1 = require("ioredis");
 const assert = require("assert");
@@ -66,22 +65,22 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
     }
 };
 __decorate([
-    (0, decorator_1.Config)('redis'),
+    (0, core_1.Config)('redis'),
     __metadata("design:type", Object)
 ], RedisServiceFactory.prototype, "redisConfig", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], RedisServiceFactory.prototype, "init", null);
 __decorate([
-    (0, decorator_1.Logger)('coreLogger'),
+    (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], RedisServiceFactory.prototype, "logger", void 0);
 RedisServiceFactory = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], RedisServiceFactory);
 exports.RedisServiceFactory = RedisServiceFactory;
 let RedisService = class RedisService {
@@ -93,18 +92,18 @@ let RedisService = class RedisService {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", RedisServiceFactory)
 ], RedisService.prototype, "serviceFactory", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], RedisService.prototype, "init", null);
 RedisService = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], RedisService);
 exports.RedisService = RedisService;
 (0, core_1.delegateTargetAllPrototypeMethod)(RedisService, ioredis_1.default);

package/index.d.ts

@@ -1,9 +1,9 @@
 import { ClusterNode, ClusterOptions } from 'ioredis';
+import * as Redis from 'ioredis';
+import { RedisConfigOptions } from './dist';
 
 export * from './dist/index';
 
-import * as Redis from 'ioredis';
-
 // Single Redis
 // client: {
 //   host: 'host',
@@ -51,12 +51,6 @@ import * as Redis from 'ioredis';
 
 declare module '@midwayjs/core/dist/interface' {
   interface MidwayConfig {
-    redis?: ServiceFactoryConfigOption<
-      | Redis.RedisOptions
-      | ({
-          cluster?: boolean;
-          nodes?: ClusterNode[];
-        } & ClusterOptions)
-    >;
+    redis?: ServiceFactoryConfigOption<RedisConfigOptions>;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "3.5.3",
+  "version": "3.7.0",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -10,9 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.5.3",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.5.3"
+    "@midwayjs/core": "^3.7.0",
+    "@midwayjs/mock": "^3.7.0"
   },
   "dependencies": {
     "ioredis": "^5.0.0"
@@ -36,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
 }