@midwayjs/consul 3.0.0-alpha.9 → 3.0.0-beta.4

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+**Note:** Version bump only for package @midwayjs/consul
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/consul
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+**Note:** Version bump only for package @midwayjs/consul
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/consul

package/dist/configuration.d.ts

@@ -1,7 +1,7 @@
 import { ILifeCycle, IMidwayApplication, IMidwayContainer } from '@midwayjs/core';
 import { IConsulProviderInfoOptions, IConsulRegisterInfoOptions } from './interface';
 import { ConsulProvider } from './lib/provider';
-export declare class AutoConfiguration implements ILifeCycle {
+export declare class ConsulConfiguration implements ILifeCycle {
     /**
      * 有关 consul server 的配置
      */

package/dist/configuration.js

@@ -9,11 +9,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutoConfiguration = void 0;
+exports.ConsulConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const path_1 = require("path");
 const provider_1 = require("./lib/provider");
-let AutoConfiguration = class AutoConfiguration {
+const DefaultConfig = require("./config/config.default");
+let ConsulConfiguration = class ConsulConfiguration {
     get consulProvider() {
         const symbol = Symbol('consulProvider');
         this[symbol] =
@@ -54,7 +54,7 @@ let AutoConfiguration = class AutoConfiguration {
                             });
             Object.assign(this.consulRegisterConfig, config);
             // 把原始的 consul 对象注入到容器
-            container.registerObject('consul', this.consulProvider.getConsul());
+            container.registerObject('consul:consul', this.consulProvider.getConsul());
             await this.consulProvider.registerService(this.consulRegisterConfig);
         }
     }
@@ -70,18 +70,22 @@ let AutoConfiguration = class AutoConfiguration {
     }
 };
 __decorate([
-    decorator_1.Config('consul.provider'),
+    (0, decorator_1.Config)('consul.provider'),
     __metadata("design:type", Object)
-], AutoConfiguration.prototype, "consulProviderConfig", void 0);
+], ConsulConfiguration.prototype, "consulProviderConfig", void 0);
 __decorate([
-    decorator_1.Config('consul.service'),
+    (0, decorator_1.Config)('consul.service'),
     __metadata("design:type", Object)
-], AutoConfiguration.prototype, "consulRegisterConfig", void 0);
-AutoConfiguration = __decorate([
-    decorator_1.Configuration({
+], ConsulConfiguration.prototype, "consulRegisterConfig", void 0);
+ConsulConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
         namespace: 'consul',
-        importConfigs: [path_1.join(__dirname, 'config')],
+        importConfigs: [
+            {
+                default: DefaultConfig,
+            },
+        ],
     })
-], AutoConfiguration);
-exports.AutoConfiguration = AutoConfiguration;
+], ConsulConfiguration);
+exports.ConsulConfiguration = ConsulConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/controller/consul.js

@@ -19,14 +19,14 @@ let ConsulController = class ConsulController {
     }
 };
 __decorate([
-    decorator_1.Get('/health/self/check'),
+    (0, decorator_1.Get)('/health/self/check'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ConsulController.prototype, "healthCheck", null);
 ConsulController = __decorate([
-    decorator_1.Provide(),
-    decorator_1.Controller('/consul')
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Controller)('/consul')
 ], ConsulController);
 exports.ConsulController = ConsulController;
 //# sourceMappingURL=consul.js.map

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { AutoConfiguration as Configuration } from './configuration';
+export { ConsulConfiguration as Configuration } from './configuration';
 export * from './controller/consul';
 export * from './service/balancer';
 export * from './interface';

package/dist/index.js

@@ -12,7 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
-Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.AutoConfiguration; } });
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.ConsulConfiguration; } });
 __exportStar(require("./controller/consul"), exports);
 __exportStar(require("./service/balancer"), exports);
 __exportStar(require("./interface"), exports);

package/dist/interface.d.ts

@@ -1,5 +1,5 @@
-import * as Consul from "consul";
-import { ConsulOptions } from "consul";
+import * as Consul from 'consul';
+import { ConsulOptions } from 'consul';
 import RegisterOptions = Consul.Agent.Service.RegisterOptions;
 export interface IServiceBalancer {
     /**
@@ -65,4 +65,10 @@ export interface IConsulRegisterInfoOptions extends RegisterOptions {
         status?: string;
     };
 }
+declare module '@midwayjs/core/dist/interface' {
+    interface MidwayConfig {
+        consul?: IConsulProviderInfoOptions;
+        service?: IConsulRegisterInfoOptions;
+    }
+}
 //# sourceMappingURL=interface.d.ts.map

package/dist/service/balancer.js

@@ -22,18 +22,18 @@ let BalancerService = class BalancerService {
     }
 };
 __decorate([
-    decorator_1.Inject(),
+    (0, decorator_1.Inject)('consul:consul'),
     __metadata("design:type", Object)
 ], BalancerService.prototype, "consul", void 0);
 __decorate([
-    decorator_1.Init(),
+    (0, decorator_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], BalancerService.prototype, "init", null);
 BalancerService = __decorate([
-    decorator_1.Provide(),
-    decorator_1.Scope(decorator_1.ScopeEnum.Singleton)
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
 ], BalancerService);
 exports.BalancerService = BalancerService;
 //# sourceMappingURL=balancer.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/consul",
   "description": "midway consul",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.4",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "files": [
@@ -9,10 +9,10 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/koa": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
+    "@midwayjs/core": "^3.0.0-beta.4",
+    "@midwayjs/decorator": "^3.0.0-beta.4",
+    "@midwayjs/koa": "^3.0.0-beta.4",
+    "@midwayjs/mock": "^3.0.0-beta.4",
     "@types/consul": "^0.23.34",
     "@types/sinon": "^10.0.2",
     "nock": "^13.0.11"
@@ -32,9 +32,12 @@
     "ci": "npm run test",
     "lint": "mwts check"
   },
+  "engines": {
+    "node": ">=12"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "gitHead": "02e2144e302f807770b512b0d89da3145b1cbf2e"
 }