@midwayjs/core 3.0.0-beta.15 → 3.0.0-beta.16

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/common/fileDetector.js

@@ -47,7 +47,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
                                 continue;
                             }
                         }
-                        else if ((0, decorator_1.isRegExp)(resolveFilter.pattern)) {
+                        else if (decorator_1.TYPES.isRegExp(resolveFilter.pattern)) {
                             if (resolveFilter.pattern.test(file)) {
                                 const exports = resolveFilter.ignoreRequire
                                     ? undefined

package/dist/common/webRouterCollector.js

@@ -232,7 +232,7 @@ class WebRouterCollector {
         return urlMatchList
             .map(item => {
             const urlString = item.url.toString();
-            const weightArr = (0, decorator_1.isRegExp)(item.url)
+            const weightArr = decorator_1.TYPES.isRegExp(item.url)
                 ? urlString.split('\\/')
                 : urlString.split('/');
             let weight = 0;

package/dist/context/container.js

@@ -144,16 +144,16 @@ class ContainerConfiguration {
     }
     getConfigurationExport(exports) {
         const mods = [];
-        if ((0, decorator_1.isClass)(exports) ||
-            (0, decorator_1.isFunction)(exports) ||
+        if (decorator_1.TYPES.isClass(exports) ||
+            decorator_1.TYPES.isFunction(exports) ||
             exports instanceof configuration_1.FunctionalConfiguration) {
             mods.push(exports);
         }
         else {
             for (const m in exports) {
                 const module = exports[m];
-                if ((0, decorator_1.isClass)(module) ||
-                    (0, decorator_1.isFunction)(module) ||
+                if (decorator_1.TYPES.isClass(module) ||
+                    decorator_1.TYPES.isFunction(module) ||
                     module instanceof configuration_1.FunctionalConfiguration) {
                     mods.push(module);
                 }
@@ -240,13 +240,13 @@ class MidwayContainer {
         (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.run(this);
     }
     bindClass(exports, options) {
-        if ((0, decorator_1.isClass)(exports) || (0, decorator_1.isFunction)(exports)) {
+        if (decorator_1.TYPES.isClass(exports) || decorator_1.TYPES.isFunction(exports)) {
             this.bindModule(exports, options);
         }
         else {
             for (const m in exports) {
                 const module = exports[m];
-                if ((0, decorator_1.isClass)(module) || (0, decorator_1.isFunction)(module)) {
+                if (decorator_1.TYPES.isClass(module) || decorator_1.TYPES.isFunction(module)) {
                     this.bindModule(module, options);
                 }
             }
@@ -254,7 +254,7 @@ class MidwayContainer {
     }
     bind(identifier, target, options) {
         var _a;
-        if ((0, decorator_1.isClass)(identifier) || (0, decorator_1.isFunction)(identifier)) {
+        if (decorator_1.TYPES.isClass(identifier) || decorator_1.TYPES.isFunction(identifier)) {
             return this.bindModule(identifier, target);
         }
         if (this.registry.hasDefinition(identifier)) {
@@ -262,13 +262,13 @@ class MidwayContainer {
             return;
         }
         let definition;
-        if ((0, decorator_1.isClass)(target)) {
+        if (decorator_1.TYPES.isClass(target)) {
             definition = new objectDefinition_1.ObjectDefinition();
             definition.name = (0, decorator_1.getProviderName)(target);
         }
         else {
             definition = new functionDefinition_1.FunctionDefinition();
-            if (!(0, decorator_1.isAsyncFunction)(target)) {
+            if (!decorator_1.TYPES.isAsyncFunction(target)) {
                 definition.asynchronous = false;
             }
             definition.name = definition.id;
@@ -327,7 +327,7 @@ class MidwayContainer {
         }
     }
     bindModule(module, options) {
-        if ((0, decorator_1.isClass)(module)) {
+        if (decorator_1.TYPES.isClass(module)) {
             const providerId = (0, decorator_1.getProviderUUId)(module);
             if (providerId) {
                 this.identifierMapping.saveClassRelation(module, options === null || options === void 0 ? void 0 : options.namespace);

package/dist/definitions/objectCreator.js

@@ -65,7 +65,7 @@ class ObjectCreator {
         let inst;
         if (this.definition.constructMethod) {
             const fn = Clzz[this.definition.constructMethod];
-            if ((0, decorator_1.isAsyncFunction)(fn)) {
+            if (decorator_1.TYPES.isAsyncFunction(fn)) {
                 inst = await fn.apply(Clzz, args);
             }
             else {
@@ -86,13 +86,13 @@ class ObjectCreator {
         const inst = obj;
         // after properties set then do init
         if (this.definition.initMethod && inst[this.definition.initMethod]) {
-            if ((0, decorator_1.isGeneratorFunction)(inst[this.definition.initMethod]) ||
-                (0, decorator_1.isAsyncFunction)(inst[this.definition.initMethod])) {
+            if (decorator_1.TYPES.isGeneratorFunction(inst[this.definition.initMethod]) ||
+                decorator_1.TYPES.isAsyncFunction(inst[this.definition.initMethod])) {
                 throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
             }
             else {
                 const rt = inst[this.definition.initMethod].call(inst);
-                if ((0, decorator_1.isPromise)(rt)) {
+                if (decorator_1.TYPES.isPromise(rt)) {
                     throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
                 }
             }
@@ -107,7 +107,7 @@ class ObjectCreator {
         const inst = obj;
         if (this.definition.initMethod && inst[this.definition.initMethod]) {
             const initFn = inst[this.definition.initMethod];
-            if ((0, decorator_1.isAsyncFunction)(initFn)) {
+            if (decorator_1.TYPES.isAsyncFunction(initFn)) {
                 await initFn.call(inst);
             }
             else {
@@ -140,7 +140,7 @@ class ObjectCreator {
     async doDestroyAsync(obj) {
         if (this.definition.destroyMethod && obj[this.definition.destroyMethod]) {
             const fn = obj[this.definition.destroyMethod];
-            if ((0, decorator_1.isAsyncFunction)(fn)) {
+            if (decorator_1.TYPES.isAsyncFunction(fn)) {
                 await fn.call(obj);
             }
             else {

package/dist/service/aspectService.js

@@ -64,7 +64,7 @@ let MidwayAspectService = class MidwayAspectService {
      */
     interceptPrototypeMethod(Clz, methodName, aspectObject) {
         const originMethod = Clz.prototype[methodName];
-        if ((0, decorator_1.isAsyncFunction)(Clz.prototype[methodName])) {
+        if (decorator_1.TYPES.isAsyncFunction(Clz.prototype[methodName])) {
             Clz.prototype[methodName] = async function (...args) {
                 var _a, _b, _c;
                 let error, result;

package/dist/service/configService.js

@@ -107,7 +107,7 @@ let MidwayConfigService = class MidwayConfigService {
         const target = {};
         for (const filename of [...defaultSet, ...currentEnvSet]) {
             let config = await this.loadConfig(filename);
-            if ((0, decorator_1.isFunction)(config)) {
+            if (decorator_1.TYPES.isFunction(config)) {
                 // eslint-disable-next-line prefer-spread
                 config = config.apply(null, [this.appInfo, target]);
             }

package/dist/service/loggerService.d.ts

@@ -7,7 +7,7 @@ export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     configService: MidwayConfigService;
     constructor(applicationContext: IMidwayContainer);
     protected init(): Promise<void>;
-    transformEggConfig(): {
+    protected transformEggConfig(): {
         midwayLogger: {
             default: {};
             clients: {};

package/dist/service/middlewareService.js

@@ -23,7 +23,7 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         }
         const newMiddlewareArr = [];
         for (let fn of middleware) {
-            if ((0, decorator_1.isClass)(fn) || typeof fn === 'string') {
+            if (decorator_1.TYPES.isClass(fn) || typeof fn === 'string') {
                 if (typeof fn === 'string' &&
                     !this.applicationContext.hasDefinition(fn)) {
                     throw new error_1.MidwayCommonError('Middleware definition not found in midway container');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0-beta.16",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.15",
+    "@midwayjs/decorator": "^3.0.0-beta.16",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "6b9778557289d9e8b562c7ce6127736db1248973"
+  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
 }