@midwayjs/core 3.0.0-beta.9 → 3.0.0

package/dist/service/decoratorService.js

@@ -30,7 +30,10 @@ let MidwayDecoratorService = class MidwayDecoratorService {
             if (methodDecoratorMetadataList) {
                 // loop it, save this order for decorator run
                 for (const meta of methodDecoratorMetadataList) {
-                    const { propertyName, key, metadata } = meta;
+                    const { propertyName, key, metadata, impl } = meta;
+                    if (!impl) {
+                        continue;
+                    }
                     // add aspect implementation first
                     this.aspectService.interceptPrototypeMethod(Clzz, propertyName, () => {
                         const methodDecoratorHandler = this.methodDecoratorMap.get(key);
@@ -57,7 +60,10 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                 // joinPoint.args
                                 const newArgs = [...joinPoint.args];
                                 for (const meta of parameterDecoratorMetadata[methodName]) {
-                                    const { propertyName, key, metadata, parameterIndex } = meta;
+                                    const { propertyName, key, metadata, parameterIndex, impl } = meta;
+                                    if (!impl) {
+                                        continue;
+                                    }
                                     const parameterDecoratorHandler = this.parameterDecoratorMap.get(key);
                                     if (!parameterDecoratorHandler) {
                                         throw new error_1.MidwayCommonError(`Parameter Decorator "${key}" handler not found, please register first.`);
@@ -95,15 +101,15 @@ let MidwayDecoratorService = class MidwayDecoratorService {
         });
     }
     registerPropertyHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register property decorator key="${decoratorKey}"`);
+        debug(`[core]: Register property decorator key="${decoratorKey}"`);
         this.propertyHandlerMap.set(decoratorKey, fn);
     }
     registerMethodHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register method decorator key="${decoratorKey}"`);
+        debug(`[core]: Register method decorator key="${decoratorKey}"`);
         this.methodDecoratorMap.set(decoratorKey, fn);
     }
     registerParameterHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register parameter decorator key="${decoratorKey}"`);
+        debug(`[core]: Register parameter decorator key="${decoratorKey}"`);
         this.parameterDecoratorMap.set(decoratorKey, fn);
     }
     /**

package/dist/service/environmentService.d.ts

@@ -1,6 +1,6 @@
 import { IEnvironmentService } from '../interface';
 export declare class MidwayEnvironmentService implements IEnvironmentService {
-    environment: string;
+    protected environment: string;
     getCurrentEnvironment(): string;
     setCurrentEnvironment(environment: string): void;
     isDevelopmentEnvironment(): boolean;

package/dist/service/frameworkService.d.ts

@@ -4,6 +4,7 @@ import { MidwayConfigService } from './configService';
 import { MidwayLoggerService } from './loggerService';
 import { MidwayDecoratorService } from './decoratorService';
 import { MidwayAspectService } from './aspectService';
+import { MidwayApplicationManager } from '../common/applicationManager';
 export declare class MidwayFrameworkService {
     readonly applicationContext: IMidwayContainer;
     readonly globalOptions: any;
@@ -11,14 +12,14 @@ export declare class MidwayFrameworkService {
     loggerService: MidwayLoggerService;
     aspectService: MidwayAspectService;
     decoratorService: MidwayDecoratorService;
+    applicationManager: MidwayApplicationManager;
     constructor(applicationContext: IMidwayContainer, globalOptions: any);
     private mainFramework;
-    private globalFrameworkMap;
     private globalFrameworkList;
     protected init(): Promise<void>;
     getMainApp(): any;
     getMainFramework(): IMidwayFramework<any, any, any, unknown, unknown>;
-    getFramework(type: MidwayFrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
+    getFramework(namespaceOrFrameworkType: string | MidwayFrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
     runFramework(): Promise<void>;
     stopFramework(): Promise<void>;
 }

package/dist/service/frameworkService.js

@@ -18,6 +18,7 @@ const baseFramework_1 = require("../baseFramework");
 const pipelineService_1 = require("./pipelineService");
 const decoratorService_1 = require("./decoratorService");
 const aspectService_1 = require("./aspectService");
+const applicationManager_1 = require("../common/applicationManager");
 const util = require("util");
 const error_1 = require("../error");
 const debug = util.debuglog('midway:debug');
@@ -25,10 +26,10 @@ let MidwayFrameworkService = class MidwayFrameworkService {
     constructor(applicationContext, globalOptions) {
         this.applicationContext = applicationContext;
         this.globalOptions = globalOptions;
-        this.globalFrameworkMap = new WeakMap();
         this.globalFrameworkList = [];
     }
     async init() {
+        var _a;
         // register base config hook
         this.decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
             var _a;
@@ -51,7 +52,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto
         frameworks = filterProtoFramework(frameworks);
-        debug(`[core:framework]: Found Framework length = ${frameworks.length}`);
+        debug(`[core]: Found Framework length = ${frameworks.length}`);
         if (frameworks.length) {
             for (const frameworkClz of frameworks) {
                 const frameworkInstance = await this.applicationContext.getAsync(frameworkClz, [this.applicationContext]);
@@ -62,24 +63,24 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                         applicationContext: this.applicationContext,
                         ...this.globalOptions,
                     });
-                    debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and initialize.`);
+                    debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and initialize.`);
                 }
                 else {
-                    debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and delay initialize.`);
+                    debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and delay initialize.`);
                 }
                 // app init
-                this.globalFrameworkMap.set(frameworkInstance.getFrameworkType(), frameworkInstance);
+                const definition = this.applicationContext.registry.getDefinition((0, decorator_1.getProviderUUId)(frameworkClz));
+                this.applicationManager.addFramework((_a = definition === null || definition === void 0 ? void 0 : definition.namespace) !== null && _a !== void 0 ? _a : frameworkInstance.getFrameworkName(), frameworkInstance);
                 this.globalFrameworkList.push(frameworkInstance);
             }
             // register @App decorator handler
             this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
                 if (mete.type) {
-                    if (this.globalFrameworkMap.has(mete.type)) {
-                        return this.globalFrameworkMap.get(mete.type).getApplication();
-                    }
-                    else {
+                    const framework = this.applicationManager.getApplication(mete.type);
+                    if (!framework) {
                         throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
                     }
+                    return framework;
                 }
                 else {
                     return this.getMainApp();
@@ -107,8 +108,8 @@ let MidwayFrameworkService = class MidwayFrameworkService {
     getMainFramework() {
         return this.mainFramework;
     }
-    getFramework(type) {
-        return this.globalFrameworkMap.get(type);
+    getFramework(namespaceOrFrameworkType) {
+        return this.applicationManager.getFramework(namespaceOrFrameworkType);
     }
     async runFramework() {
         for (const frameworkInstance of this.globalFrameworkList) {
@@ -116,7 +117,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             if (frameworkInstance.isEnable()) {
                 // app init
                 await frameworkInstance.run();
-                debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and run.`);
+                debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and run.`);
             }
         }
     }
@@ -142,6 +143,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", decoratorService_1.MidwayDecoratorService)
 ], MidwayFrameworkService.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", applicationManager_1.MidwayApplicationManager)
+], MidwayFrameworkService.prototype, "applicationManager", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),

package/dist/service/lifeCycleService.js

@@ -23,7 +23,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
     async init() {
         // run lifecycle
         const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
-        debug(`[core:lifecycle]: Found Configuration length = ${cycles.length}`);
+        debug(`[core]: Found Configuration length = ${cycles.length}`);
         const lifecycleInstanceList = [];
         for (const cycle of cycles) {
             if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
@@ -32,7 +32,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
             }
             else {
                 // 普通类写法
-                debug(`[core:lifecycle]: run ${cycle.target.name} init`);
+                debug(`[core]: run ${cycle.target.name} init`);
                 cycle.instance = await this.applicationContext.getAsync(cycle.target);
             }
             cycle.instance && lifecycleInstanceList.push(cycle);
@@ -80,7 +80,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         if (Array.isArray(lifecycleInstanceOrList)) {
             for (const cycle of lifecycleInstanceOrList) {
                 if (typeof cycle.instance[lifecycle] === 'function') {
-                    debug(`[core:lifecycle]: run ${cycle.instance.constructor.name} ${lifecycle}`);
+                    debug(`[core]: run ${cycle.instance.constructor.name} ${lifecycle}`);
                     const result = await cycle.instance[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
                     if (resultHandler) {
                         resultHandler(result);
@@ -90,7 +90,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         }
         else {
             if (typeof lifecycleInstanceOrList[lifecycle] === 'function') {
-                debug(`[core:lifecycle]: run ${lifecycleInstanceOrList.constructor.name} ${lifecycle}`);
+                debug(`[core]: run ${lifecycleInstanceOrList.constructor.name} ${lifecycle}`);
                 const result = await lifecycleInstanceOrList[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
                 if (resultHandler) {
                     resultHandler(result);
@@ -101,7 +101,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
     async runObjectLifeCycle(lifecycleInstanceList, lifecycle) {
         for (const cycle of lifecycleInstanceList) {
             if (typeof cycle.instance[lifecycle] === 'function') {
-                debug(`[core:lifecycle]: run ${cycle.instance.constructor.name} ${lifecycle}`);
+                debug(`[core]: run ${cycle.instance.constructor.name} ${lifecycle}`);
                 return this.applicationContext[lifecycle](cycle.instance[lifecycle].bind(cycle.instance));
             }
         }

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.d.ts

@@ -1,11 +1,10 @@
-import { CommonMiddleware, IMidwayContainer } from '../interface';
+import { CommonMiddleware, IMidwayContainer, IMidwayApplication } from '../interface';
 export declare class MidwayMiddlewareService<T, R, N = unknown> {
     readonly applicationContext: IMidwayContainer;
     constructor(applicationContext: IMidwayContainer);
-    compose(middleware: Array<CommonMiddleware<T, R, N> | string>, name?: string): Promise<{
-        (context: any, next?: any): Promise<any>;
+    compose(middleware: Array<CommonMiddleware<T, R, N> | string>, app: IMidwayApplication, name?: string): Promise<{
+        (context: T, next?: any): Promise<any>;
         _name: string;
     }>;
-    getMiddlewareName(mw: any): any;
 }
 //# sourceMappingURL=middlewareService.d.ts.map

package/dist/service/middlewareService.js

@@ -17,20 +17,20 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
     }
-    async compose(middleware, name) {
+    async compose(middleware, app, name) {
         if (!Array.isArray(middleware)) {
             throw new error_1.MidwayParameterError('Middleware stack must be an array');
         }
         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');
                 }
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
-                    fn = classMiddleware.resolve();
+                    fn = await classMiddleware.resolve(app);
                     if (!classMiddleware.match && !classMiddleware.ignore) {
                         if (!fn.name) {
                             fn._name = classMiddleware.constructor.name;
@@ -88,11 +88,11 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                             index,
                         })).then(result => {
                             // need to set body
-                            if (context.body && !result) {
-                                result = context.body;
+                            if (context['body'] && !result) {
+                                result = context['body'];
                             }
-                            else if (result && context.body !== result) {
-                                context.body = result;
+                            else if (result && context['body'] !== result) {
+                                context['body'] = result;
                             }
                             return result;
                         });
@@ -113,10 +113,6 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         }
         return composeFn;
     }
-    getMiddlewareName(mw) {
-        var _a;
-        return (_a = mw.name) !== null && _a !== void 0 ? _a : mw._name;
-    }
 };
 MidwayMiddlewareService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/setup.js

@@ -22,7 +22,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // register baseDir and appDir
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
-    if (globalOptions.moduleDirector !== false) {
+    if (globalOptions.moduleDetector !== false) {
         if (globalOptions.moduleDetector === undefined ||
             globalOptions.moduleDetector === 'file') {
             applicationContext.setFileDetector(new _1.DirectoryFileDetector({
@@ -44,6 +44,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayFrameworkService);
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
+    applicationContext.bindClass(_1.MidwayApplicationManager);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {
@@ -63,12 +64,14 @@ async function initializeGlobalApplicationContext(globalOptions) {
     await applicationContext.getAsync(_1.MidwayDecoratorService, [
         applicationContext,
     ]);
-    if (!globalOptions.configurationModule) {
-        globalOptions.configurationModule = [
+    if (!globalOptions.imports) {
+        globalOptions.imports = [
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
         ];
     }
-    for (const configurationModule of [].concat(globalOptions.configurationModule)) {
+    for (const configurationModule of []
+        .concat(globalOptions.imports)
+        .concat(globalOptions.configurationModule)) {
         // load configuration and component
         applicationContext.load(configurationModule);
     }

package/dist/util/extend.d.ts

@@ -0,0 +1,2 @@
+export declare function extend(...args: any[]): any;
+//# sourceMappingURL=extend.d.ts.map

package/dist/util/extend.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extend = void 0;
+/**
+ * fork from https://github.com/eggjs/extend2
+ */
+const decorator_1 = require("@midwayjs/decorator");
+function extend(...args) {
+    let options, name, src, copy, clone;
+    let target = args[0];
+    let i = 1;
+    const length = args.length;
+    let deep = false;
+    // Handle a deep copy situation
+    if (typeof target === 'boolean') {
+        deep = target;
+        target = args[1] || {};
+        // skip the boolean and the target
+        i = 2;
+    }
+    else if ((typeof target !== 'object' && typeof target !== 'function') ||
+        target == null) {
+        target = {};
+    }
+    for (; i < length; ++i) {
+        options = args[i];
+        // Only deal with non-null/undefined values
+        if (options == null)
+            continue;
+        // Extend the base object
+        for (name in options) {
+            if (name === '__proto__')
+                continue;
+            src = target[name];
+            copy = options[name];
+            // Prevent never-ending loop
+            if (target === copy)
+                continue;
+            // Recurse if we're merging plain objects
+            if (deep && copy && decorator_1.Types.isPlainObject(copy)) {
+                clone = src && decorator_1.Types.isPlainObject(src) ? src : {};
+                // Never move original objects, clone them
+                target[name] = extend(deep, clone, copy);
+                // Don't bring in undefined values
+            }
+            else if (typeof copy !== 'undefined') {
+                target[name] = copy;
+            }
+        }
+    }
+    // Return the modified object
+    return target;
+}
+exports.extend = extend;
+//# sourceMappingURL=extend.js.map

package/dist/util/webRouterParam.js

@@ -22,9 +22,25 @@ const extractKoaLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? ctx.session[data] : ctx.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return ctx.getFileStream && ctx.getFileStream(data);
+                if (ctx.getFileStream) {
+                    return ctx.getFileStream(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files[0];
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return ctx.multipart && ctx.multipart(data);
+                if (ctx.multipart) {
+                    return ctx.multipart(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files;
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return ctx['path'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -36,6 +52,8 @@ const extractKoaLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? ctx.fields[data] : ctx.fields;
             default:
                 return null;
         }
@@ -61,9 +79,9 @@ const extractExpressLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? req.session[data] : req.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return req.getFileStream && req.getFileStream(data);
+                return req.files ? req.files[0] : undefined;
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return req.multipart && req.multipart(data);
+                return req.files;
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return req['baseUrl'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -75,6 +93,8 @@ const extractExpressLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? req.fields[data] : req.fields;
             default:
                 return null;
         }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -21,22 +21,20 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.9",
-    "koa": "^2.13.4",
+    "@midwayjs/decorator": "^3.0.0",
+    "koa": "2.13.4",
     "midway-test-component": "*",
-    "mm": "3",
-    "sinon": "^7.2.2"
+    "mm": "3.2.0",
+    "sinon": "12.0.1"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.9",
+    "@midwayjs/logger": "2.14.0",
     "class-transformer": "^0.5.1",
-    "extend2": "^1.0.0",
-    "picomatch": "^2.2.2",
-    "reflect-metadata": "^0.1.13"
+    "picomatch": "2.3.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -46,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "d23e4a4fee58097b98461625c428a37d55535cec"
+  "gitHead": "55c26029bccf7bbb739fa1597e8f418dafa2caa0"
 }