@midwayjs/core 3.0.0-beta.13 → 3.0.0-beta.17

package/dist/interface.d.ts

@@ -14,9 +14,19 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
         [key: string]: PowerPartial<OPTIONS>;
     };
 };
-declare type ConfigType<T> = T extends (...args: any[]) => any ? PowerPartial<ReturnType<T>> : PowerPartial<T>;
+declare type ConfigType<T> = T extends (...args: any[]) => any ? Writable<PowerPartial<ReturnType<T>>> : Writable<PowerPartial<T>>;
+/**
+ * Get definition from config
+ */
 export declare type FileConfigOption<T, K = unknown> = K extends keyof ConfigType<T> ? Pick<ConfigType<T>, K> : ConfigType<T>;
 /**
+ * Make object property writeable
+ */
+export declare type Writable<T> = {
+    -readonly [P in keyof T]: T[P];
+};
+/**
+ * Lifecycle Definition
  * 生命周期定义
  */
 export interface ILifeCycle extends Partial<IObjectLifeCycle> {
@@ -29,8 +39,8 @@ export declare type ObjectContext = {
     originName?: string;
 };
 /**
+ * Abstract Object Factory
  * 对象容器抽象
- * 默认用Xml容器实现一个
  */
 export interface IObjectFactory {
     registry: IObjectDefinitionRegistry;
@@ -46,32 +56,36 @@ export declare enum ObjectLifeCycleEvent {
     AFTER_INIT = "afterObjectInit",
     BEFORE_DESTROY = "beforeObjectDestroy"
 }
+interface ObjectLifeCycleOptions {
+    context: IMidwayContainer;
+    definition: IObjectDefinition;
+}
+export interface ObjectBeforeBindOptions extends ObjectLifeCycleOptions {
+    replaceCallback: (newDefinition: IObjectDefinition) => void;
+}
+export interface ObjectBeforeCreatedOptions extends ObjectLifeCycleOptions {
+    constructorArgs: any[];
+}
+export interface ObjectCreatedOptions<T> extends ObjectLifeCycleOptions {
+    replaceCallback: (ins: T) => void;
+}
+export interface ObjectInitOptions extends ObjectLifeCycleOptions {
+}
+export interface ObjectBeforeDestroyOptions extends ObjectLifeCycleOptions {
+}
+/**
+ * Object Lifecycle
+ * 对象生命周期
+ */
 export interface IObjectLifeCycle {
-    onBeforeBind(fn: (Clzz: any, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        replaceCallback: (newDefinition: IObjectDefinition) => void;
-    }) => void): any;
-    onBeforeObjectCreated(fn: (Clzz: any, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        constructorArgs: any[];
-    }) => void): any;
-    onObjectCreated<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        replaceCallback: (ins: T) => void;
-    }) => void): any;
-    onObjectInit<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-    }) => void): any;
-    onBeforeObjectDestroy<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-    }) => void): any;
+    onBeforeBind(fn: (Clzz: any, options: ObjectBeforeBindOptions) => void): any;
+    onBeforeObjectCreated(fn: (Clzz: any, options: ObjectBeforeCreatedOptions) => void): any;
+    onObjectCreated<T>(fn: (ins: T, options: ObjectCreatedOptions<T>) => void): any;
+    onObjectInit<T>(fn: (ins: T, options: ObjectInitOptions) => void): any;
+    onBeforeObjectDestroy<T>(fn: (ins: T, options: ObjectBeforeDestroyOptions) => void): any;
 }
 /**
+ * Object Definition
  * 对象描述定义
  */
 export interface IObjectDefinition {
@@ -112,6 +126,7 @@ export interface IObjectDefinition {
         metadata: any;
     }>;
     createFrom: 'framework' | 'file' | 'module';
+    allowDowngrade: boolean;
 }
 export interface IObjectCreator {
     load(): any;
@@ -123,6 +138,7 @@ export interface IObjectCreator {
     doDestroyAsync(obj: any): Promise<void>;
 }
 /**
+ * Object Definition Registry
  * 对象定义存储容器
  */
 export interface IObjectDefinitionRegistry {
@@ -279,7 +295,7 @@ export declare type NextFunction = () => Promise<any>;
  * Common middleware definition
  */
 export interface IMiddleware<CTX, R, N = unknown> {
-    resolve: (app?: IMidwayApplication) => FunctionMiddleware<CTX, R, N>;
+    resolve: (app?: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
     match?: (ctx?: CTX) => boolean;
     ignore?: (ctx?: CTX) => boolean;
 }
@@ -396,7 +412,11 @@ export interface IMidwayBootstrapOptions {
     appDir?: string;
     applicationContext?: IMidwayContainer;
     preloadModules?: any[];
+    /**
+     * @deprecated please use 'imports'
+     */
     configurationModule?: any | any[];
+    imports?: any | any[];
     moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
     ignore?: string[];
@@ -452,10 +472,5 @@ export interface MidwayAppInfo {
 export interface MidwayConfig extends FileConfigOption<typeof _default> {
     [customConfigKey: string]: unknown;
 }
-export interface TranslateOptions {
-    lang?: string;
-    group?: string;
-    args?: any;
-}
 export {};
 //# sourceMappingURL=interface.d.ts.map

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

@@ -1,4 +1,4 @@
-import { IConfigService } from '../interface';
+import { IConfigService, MidwayAppInfo } from '../interface';
 import { MidwayEnvironmentService } from './environmentService';
 import { MidwayInformationService } from './informationService';
 export declare class MidwayConfigService implements IConfigService {
@@ -7,8 +7,10 @@ export declare class MidwayConfigService implements IConfigService {
     protected configuration: any;
     protected isReady: boolean;
     protected externalObject: Record<string, unknown>[];
+    protected appInfo: MidwayAppInfo;
     protected environmentService: MidwayEnvironmentService;
     protected informationService: MidwayInformationService;
+    protected init(): Promise<void>;
     add(configFilePaths: any[]): void;
     addObject(obj: Record<string, unknown>): void;
     private getEnvSet;

package/dist/service/configService.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayConfigService = void 0;
-const extend = require("extend2");
 const path_1 = require("path");
 const util_1 = require("../util");
 const fs_1 = require("fs");
@@ -18,6 +17,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const util = require("util");
 const environmentService_1 = require("./environmentService");
 const informationService_1 = require("./informationService");
+const extend_1 = require("../util/extend");
 const debug = util.debuglog('midway:debug');
 let MidwayConfigService = class MidwayConfigService {
     constructor() {
@@ -29,6 +29,17 @@ let MidwayConfigService = class MidwayConfigService {
         this.isReady = false;
         this.externalObject = [];
     }
+    async init() {
+        this.appInfo = {
+            pkg: this.informationService.getPkg(),
+            name: this.informationService.getProjectName(),
+            baseDir: this.informationService.getBaseDir(),
+            appDir: this.informationService.getAppDir(),
+            HOME: this.informationService.getHome(),
+            root: this.informationService.getRoot(),
+            env: this.environmentService.getCurrentEnvironment(),
+        };
+    }
     add(configFilePaths) {
         for (const dir of configFilePaths) {
             if (typeof dir === 'string') {
@@ -63,7 +74,7 @@ let MidwayConfigService = class MidwayConfigService {
     }
     addObject(obj) {
         if (this.isReady) {
-            extend(true, this.configuration, obj);
+            (0, extend_1.extend)(true, this.configuration, obj);
         }
         else {
             this.externalObject.push(obj);
@@ -96,20 +107,9 @@ 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, [
-                    {
-                        pkg: this.informationService.getPkg(),
-                        name: this.informationService.getProjectName(),
-                        baseDir: this.informationService.getBaseDir(),
-                        appDir: this.informationService.getAppDir(),
-                        HOME: this.informationService.getHome(),
-                        root: this.informationService.getRoot(),
-                        env: this.environmentService.getCurrentEnvironment(),
-                    },
-                    target,
-                ]);
+                config = config.apply(null, [this.appInfo, target]);
             }
             if (!config) {
                 continue;
@@ -120,13 +120,13 @@ let MidwayConfigService = class MidwayConfigService {
             else {
                 debug('[config]: Loaded config %j', config);
             }
-            extend(true, target, config);
+            (0, extend_1.extend)(true, target, config);
         }
         if (this.externalObject.length) {
             for (const externalObject of this.externalObject) {
                 if (externalObject) {
                     debug('[config]: Loaded external object %j', externalObject);
-                    extend(true, target, externalObject);
+                    (0, extend_1.extend)(true, target, externalObject);
                 }
             }
         }
@@ -160,6 +160,12 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", informationService_1.MidwayInformationService)
 ], MidwayConfigService.prototype, "informationService", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], MidwayConfigService.prototype, "init", null);
 MidwayConfigService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)

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/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

@@ -3,7 +3,7 @@ export declare class MidwayMiddlewareService<T, R, N = unknown> {
     readonly applicationContext: IMidwayContainer;
     constructor(applicationContext: IMidwayContainer);
     compose(middleware: Array<CommonMiddleware<T, R, N> | string>, app: IMidwayApplication, name?: string): Promise<{
-        (context: any, next?: any): Promise<any>;
+        (context: T, next?: any): Promise<any>;
         _name: string;
     }>;
 }

package/dist/service/middlewareService.js

@@ -23,14 +23,14 @@ 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');
                 }
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
-                    fn = classMiddleware.resolve(app);
+                    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;
                         });

package/dist/setup.js

@@ -64,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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.13",
+  "version": "3.0.0-beta.17",
   "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,21 +21,20 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.13",
-    "koa": "^2.13.4",
+    "@midwayjs/decorator": "^3.0.0-beta.17",
+    "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.13",
+    "@midwayjs/logger": "2.14.0",
     "class-transformer": "^0.5.1",
-    "extend2": "^1.0.0",
-    "picomatch": "^2.3.0"
+    "picomatch": "2.3.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -45,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "d3c47770fee9dce33a8d148882173fd7782864ad"
+  "gitHead": "17a8b5bd3d0b0b21f24dd2f165b5df9097fc3ec4"
 }