@midwayjs/core 3.2.2 → 3.3.2

package/dist/baseFramework.js

@@ -272,7 +272,7 @@ class BaseFramework {
         return this.informationService.getProjectName();
     }
     getFrameworkName() {
-        return '';
+        return this.constructor.name;
     }
     useMiddleware(middleware) {
         this.middlewareManager.insertLast(middleware);

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
 export { extend } from './util/extend';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayFrameworkType = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayFrameworkType = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -29,6 +29,7 @@ Object.defineProperty(exports, "safeRequire", { enumerable: true, get: function
 Object.defineProperty(exports, "delegateTargetPrototypeMethod", { enumerable: true, get: function () { return util_1.delegateTargetPrototypeMethod; } });
 Object.defineProperty(exports, "delegateTargetMethod", { enumerable: true, get: function () { return util_1.delegateTargetMethod; } });
 Object.defineProperty(exports, "delegateTargetProperties", { enumerable: true, get: function () { return util_1.delegateTargetProperties; } });
+Object.defineProperty(exports, "delegateTargetAllPrototypeMethod", { enumerable: true, get: function () { return util_1.delegateTargetAllPrototypeMethod; } });
 Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: function () { return util_1.deprecatedOutput; } });
 Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: true, get: function () { return util_1.transformRequestObjectByType; } });
 Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });

package/dist/service/configService.js

@@ -67,8 +67,12 @@ let MidwayConfigService = class MidwayConfigService {
             else {
                 // object add
                 for (const env in dir) {
-                    const envSet = this.getEnvSet(env);
-                    envSet.add(dir[env]);
+                    if (this.aliasMap[env]) {
+                        this.getEnvSet(this.aliasMap[env]).add(dir[env]);
+                    }
+                    else {
+                        this.getEnvSet(env).add(dir[env]);
+                    }
                 }
             }
         }

package/dist/service/frameworkService.js

@@ -29,7 +29,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         this.globalFrameworkList = [];
     }
     async init() {
-        var _a;
+        var _a, _b;
         // register base config hook
         this.decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
             var _a;
@@ -55,6 +55,10 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         debug(`[core]: Found Framework length = ${frameworks.length}`);
         if (frameworks.length) {
             for (const frameworkClz of frameworks) {
+                if (!this.applicationContext.hasDefinition((0, decorator_1.getProviderUUId)(frameworkClz))) {
+                    debug(`[core]: Found Framework "${frameworkClz.name}" but missing definition, skip initialize.`);
+                    continue;
+                }
                 const frameworkInstance = await this.applicationContext.getAsync(frameworkClz, [this.applicationContext]);
                 // if enable, just init framework
                 if (frameworkInstance.isEnable()) {
@@ -89,8 +93,13 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
                 return this.getMainApp()[key];
             });
+            const nsSet = this.applicationContext['namespaceSet'];
+            let mainNs;
+            if (nsSet.size > 0) {
+                [mainNs] = nsSet;
+            }
             global['MIDWAY_MAIN_FRAMEWORK'] = this.mainFramework =
-                this.globalFrameworkList[0];
+                (_b = this.applicationManager.getFramework(mainNs)) !== null && _b !== void 0 ? _b : this.globalFrameworkList[0];
         }
         // init aspect module
         await this.aspectService.loadAspect();

package/dist/service/middlewareService.js

@@ -27,7 +27,7 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
             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');
+                    throw new error_1.MidwayCommonError(`Middleware definition of "${fn}" not found in midway container`);
                 }
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {

package/dist/service/mockService.d.ts

@@ -9,6 +9,10 @@ export declare class MidwayMockService {
     }>;
     protected cache: Map<any, any>;
     constructor(applicationContext: IMidwayContainer);
+    init(): Promise<void>;
+    static prepareMocks: any[];
+    static mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any): void;
+    static mockProperty(obj: new (...args: any[]) => any, key: string, value: any): void;
     mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any): void;
     mockProperty(obj: any, key: string, value: any): void;
     mockContext(app: IMidwayApplication, key: string | ((ctx: IMidwayContext) => void), value?: PropertyDescriptor | any): void;
@@ -16,7 +20,6 @@ export declare class MidwayMockService {
     isMocked(obj: any, key: any): any;
     applyContextMocks(app: IMidwayApplication, ctx: IMidwayContext): void;
     getContextMocksSize(): number;
-    getMocksSize(): number;
     private overridePropertyDescriptor;
 }
 //# sourceMappingURL=mockService.d.ts.map

package/dist/service/mockService.js

@@ -8,16 +8,35 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var MidwayMockService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayMockService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-let MidwayMockService = class MidwayMockService {
+let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
         this.mocks = [];
         this.contextMocks = [];
         this.cache = new Map();
     }
+    async init() {
+        if (MidwayMockService_1.prepareMocks.length > 0) {
+            for (const item of MidwayMockService_1.prepareMocks) {
+                this.mockProperty(item.obj, item.key, item.value);
+            }
+            MidwayMockService_1.prepareMocks = [];
+        }
+    }
+    static mockClassProperty(clzz, propertyName, value) {
+        this.mockProperty(clzz.prototype, propertyName, value);
+    }
+    static mockProperty(obj, key, value) {
+        this.prepareMocks.push({
+            obj,
+            key,
+            value,
+        });
+    }
     mockClassProperty(clzz, propertyName, value) {
         return this.mockProperty(clzz.prototype, propertyName, value);
     }
@@ -67,6 +86,7 @@ let MidwayMockService = class MidwayMockService {
         this.mocks = [];
         this.contextMocks = [];
         this.cache.clear();
+        MidwayMockService_1.prepareMocks = [];
     }
     isMocked(obj, key) {
         const flag = this.cache.get(obj);
@@ -90,9 +110,6 @@ let MidwayMockService = class MidwayMockService {
     getContextMocksSize() {
         return this.contextMocks.length;
     }
-    getMocksSize() {
-        return this.mocks.length;
-    }
     overridePropertyDescriptor(value) {
         const descriptor = {
             configurable: true,
@@ -111,13 +128,20 @@ let MidwayMockService = class MidwayMockService {
         return descriptor;
     }
 };
+MidwayMockService.prepareMocks = [];
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], MidwayMockService.prototype, "init", null);
 __decorate([
     (0, decorator_1.Destroy)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], MidwayMockService.prototype, "restore", null);
-MidwayMockService = __decorate([
+MidwayMockService = MidwayMockService_1 = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])

package/dist/util/contextUtil.js

@@ -10,7 +10,11 @@ const getCurrentMainFramework = () => {
 };
 exports.getCurrentMainFramework = getCurrentMainFramework;
 const getCurrentMainApp = () => {
-    return (0, exports.getCurrentMainFramework)().getApplication();
+    const framework = (0, exports.getCurrentMainFramework)();
+    if (framework) {
+        return framework.getApplication();
+    }
+    return undefined;
 };
 exports.getCurrentMainApp = getCurrentMainApp;
 //# sourceMappingURL=contextUtil.js.map

package/dist/util/index.d.ts

@@ -40,6 +40,13 @@ export declare function joinURLPath(...strArray: any[]): string;
  * @since 2.0.0
  */
 export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[], otherMethods?: string[]): void;
+/**
+ * 代理目标所有的原型方法，包括原型链，不包括构造器和内部隐藏方法
+ * @param derivedCtor
+ * @param constructor
+ * @since 3.0.0
+ */
+export declare function delegateTargetAllPrototypeMethod(derivedCtor: any, constructor: any): void;
 /**
  * 代理目标原型上的特定方法
  * @param derivedCtor
@@ -55,7 +62,7 @@ export declare function delegateTargetMethod(derivedCtor: any, methods: string[]
  */
 export declare function delegateTargetProperties(derivedCtor: any, properties: string[]): void;
 /**
- * 代理目标原型属性
+ * 获取当前的时间戳
  * @since 2.0.0
  * @param timestamp
  */

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -117,19 +117,36 @@ exports.joinURLPath = joinURLPath;
  */
 function delegateTargetPrototypeMethod(derivedCtor, constructors, otherMethods) {
     constructors.forEach(baseCtor => {
-        Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
-            if (name !== 'constructor' && !/^_/.test(name)) {
-                derivedCtor.prototype[name] = function (...args) {
-                    return this.instance[name](...args);
-                };
-            }
-        });
+        if (baseCtor.prototype) {
+            Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
+                if (name !== 'constructor' &&
+                    !/^_/.test(name) &&
+                    !derivedCtor.prototype[name]) {
+                    derivedCtor.prototype[name] = function (...args) {
+                        return this.instance[name](...args);
+                    };
+                }
+            });
+        }
     });
     if (otherMethods) {
         delegateTargetMethod(derivedCtor, otherMethods);
     }
 }
 exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
+/**
+ * 代理目标所有的原型方法，包括原型链，不包括构造器和内部隐藏方法
+ * @param derivedCtor
+ * @param constructor
+ * @since 3.0.0
+ */
+function delegateTargetAllPrototypeMethod(derivedCtor, constructor) {
+    do {
+        delegateTargetPrototypeMethod(derivedCtor, [constructor]);
+        constructor = Object.getPrototypeOf(constructor);
+    } while (constructor);
+}
+exports.delegateTargetAllPrototypeMethod = delegateTargetAllPrototypeMethod;
 /**
  * 代理目标原型上的特定方法
  * @param derivedCtor
@@ -161,7 +178,7 @@ function delegateTargetProperties(derivedCtor, properties) {
 }
 exports.delegateTargetProperties = delegateTargetProperties;
 /**
- * 代理目标原型属性
+ * 获取当前的时间戳
  * @since 2.0.0
  * @param timestamp
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.2.2",
+  "version": "3.3.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "6bc097035302d01ae901d76a10e080db8554a864"
+  "gitHead": "2c7c235421ba904f8943efe31a71f452089d5d53"
 }