@midwayjs/core 3.0.0-alpha.2 → 3.0.0-alpha.40

package/CHANGELOG.md

@@ -3,26 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.0.0-alpha.2](https://github.com/midwayjs/midway/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05)
+## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 
-### Bug Fixes
-
-* npe ([b54305c](https://github.com/midwayjs/midway/commit/b54305c500ebead7e98ca8cd21f6e0738a1a050d))
-* proxy ([e1601af](https://github.com/midwayjs/midway/commit/e1601afb24b91887736ea32a576019ba3224bf62))
-
-
-
-
-
-# [3.0.0-alpha.1](https://github.com/midwayjs/midway/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04)
-
-
-### Bug Fixes
+### Features
 
-* refactor directory file detector ([259a142](https://github.com/midwayjs/midway/commit/259a1425024acc172a40df474173fd34c35c70d1))
-* refactor directory file detector ([f869942](https://github.com/midwayjs/midway/commit/f869942589a4985dfc59457fa80b536be7bdc19f))
-* remove check ([6a52e19](https://github.com/midwayjs/midway/commit/6a52e197bd3ae2274b7ced3f1704972f5f4058f2))
+* support object config load and async config ([#1212](https://github.com/midwayjs/midway/issues/1212)) ([a035ccb](https://github.com/midwayjs/midway/commit/a035ccbb513b0ba423bd2b48bc228b5e916c89e8))
 
 
 

package/dist/baseFramework.d.ts

@@ -2,7 +2,6 @@ import { IConfigurationOptions, IMidwayApplication, IMidwayBootstrapOptions, IMi
 import { MidwayFrameworkType } from '@midwayjs/decorator';
 import { ILogger, LoggerOptions } from '@midwayjs/logger';
 export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>, CTX extends IMidwayContext, OPT extends IConfigurationOptions> implements IMidwayFramework<APP, OPT> {
-    protected isTsMode: boolean;
     protected applicationContext: IMidwayContainer;
     protected logger: ILogger;
     protected appLogger: ILogger;

package/dist/baseFramework.js

@@ -2,26 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseFramework = void 0;
 const interface_1 = require("./interface");
-const container_1 = require("./context/container");
 const decorator_1 = require("@midwayjs/decorator");
 const logger_1 = require("@midwayjs/logger");
-const path_1 = require("path");
 const logger_2 = require("./logger");
 const requestContainer_1 = require("./context/requestContainer");
 const configuration_1 = require("./functional/configuration");
 const informationService_1 = require("./service/informationService");
-// function buildLoadDir(baseDir, dir) {
-//   if (!isAbsolute(dir)) {
-//     return join(baseDir, dir);
-//   }
-//   return dir;
-// }
-function setupAppDir(baseDir) {
-    return path_1.dirname(baseDir);
-}
+const containerUtil_1 = require("./util/containerUtil");
 class BaseFramework {
     constructor() {
-        this.isTsMode = true;
         this.defaultContext = {};
     }
     configure(options) {
@@ -61,7 +50,7 @@ class BaseFramework {
          */
         await this.applicationInitialize(options);
         /**
-         * start to load configuration and lifeCycle
+         * start container ready
          */
         await this.containerReady(options);
         if (this.isMainFramework !== undefined) {
@@ -85,19 +74,16 @@ class BaseFramework {
     }
     async initializeLogger(options) {
         if (!this.logger) {
-            this.logger = new Proxy(logger_2.createMidwayLogger(this, 'coreLogger'), {});
+            this.logger = new Proxy((0, logger_2.createMidwayLogger)(this, 'coreLogger'), {});
             this.logger.updateDefaultLabel(this.getFrameworkName());
         }
         if (!this.appLogger) {
-            this.appLogger = logger_2.createMidwayLogger(this, 'logger', {
+            this.appLogger = (0, logger_2.createMidwayLogger)(this, 'logger', {
                 fileLogName: 'midway-app.log',
             });
         }
     }
     async containerInitialize(options) {
-        if (!options.appDir) {
-            options.appDir = setupAppDir(options.baseDir);
-        }
         /**
          * initialize container
          */
@@ -105,11 +91,12 @@ class BaseFramework {
             this.applicationContext = options.applicationContext;
         }
         else {
-            this.applicationContext = new container_1.MidwayContainer(options.baseDir, undefined);
-            this.applicationContext.registerObject('baseDir', options.baseDir);
-            this.applicationContext.registerObject('appDir', options.appDir);
-            this.applicationContext.registerObject('isTsMode', this.isTsMode);
+            this.applicationContext = (0, containerUtil_1.createDirectoryGlobContainer)({
+                baseDir: options.baseDir,
+            });
         }
+        this.applicationContext.registerObject('baseDir', options.baseDir);
+        this.applicationContext.registerObject('appDir', options.appDir);
         /**
          * initialize base information
          */
@@ -120,28 +107,6 @@ class BaseFramework {
         await this.initializeLogger(options);
     }
     async containerDirectoryLoad(options) {
-        if (options.applicationContext) {
-            // 如果有传入全局容器，就不需要再次扫描了
-            return;
-        }
-        /**
-         * load directory and bind files to ioc container
-         */
-        if (!this.isTsMode && options.disableAutoLoad === undefined) {
-            // disable auto load in js mode by default
-            options.disableAutoLoad = true;
-        }
-        if (options.disableAutoLoad)
-            return;
-        // use baseDir in parameter first
-        // const defaultLoadDir = this.isTsMode ? [options.baseDir] : [];
-        // this.applicationContext.load({
-        //   loadDir: (options.loadDir || defaultLoadDir).map(dir => {
-        //     return buildLoadDir(options.baseDir, dir);
-        //   }),
-        //   pattern: options.pattern,
-        //   ignore: options.ignore,
-        // });
         if (options.preloadModules && options.preloadModules.length) {
             for (const preloadModule of options.preloadModules) {
                 this.applicationContext.bindClass(preloadModule);
@@ -302,40 +267,40 @@ class BaseFramework {
         // agent 不加载生命周期
         if (this.app.getProcessType() === interface_1.MidwayProcessTypeEnum.AGENT)
             return;
-        const cycles = decorator_1.listModule(decorator_1.CONFIGURATION_KEY);
+        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        const lifecycleInstanceList = [];
         for (const cycle of cycles) {
-            let inst;
             if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
                 // 函数式写法
-                inst = cycle.target;
+                cycle.instance = cycle.target;
             }
             else {
                 // 普通类写法
-                const providerId = decorator_1.getProviderId(cycle.target);
-                inst = await this.getApplicationContext().getAsync(providerId);
+                const providerId = (0, decorator_1.getProviderUUId)(cycle.target);
+                if (this.getApplicationContext().registry.hasDefinition(providerId)) {
+                    cycle.instance =
+                        await this.getApplicationContext().getAsync(providerId);
+                }
             }
-            if (typeof inst.onReady === 'function') {
-                /**
-                 * 让组件能正确获取到 bind 之后 registerObject 的对象有三个方法
-                 * 1、在 load 之后修改 bind，不太可行
-                 * 2、每次 getAsync 的时候，去掉 namespace，同时还要查找当前全局的变量，性能差
-                 * 3、一般只会在 onReady 的地方执行 registerObject（否则没有全局的意义），这个取巧的办法就是 onReady 传入一个代理，其中绑定当前的 namespace
-                 */
-                await inst.onReady(new Proxy(this.getApplicationContext(), {
-                    get: function (target, prop, receiver) {
-                        if (prop === 'getCurrentNamespace' && cycle.namespace) {
-                            return () => {
-                                return cycle.namespace;
-                            };
-                        }
-                        return Reflect.get(target, prop, receiver);
-                    },
-                }), this.app);
+            cycle.instance && lifecycleInstanceList.push(cycle);
+        }
+        // exec onConfigLoad()
+        for (const cycle of lifecycleInstanceList) {
+            if (typeof cycle.instance.onConfigLoad === 'function') {
+                const configData = await cycle.instance.onConfigLoad(this.getApplicationContext());
+                if (configData) {
+                    this.getApplicationContext().getConfigService().addObject(configData);
+                }
+            }
+        }
+        for (const cycle of lifecycleInstanceList) {
+            if (typeof cycle.instance.onReady === 'function') {
+                await cycle.instance.onReady(this.getApplicationContext(), this.app);
             }
         }
     }
     async stopLifeCycles() {
-        const cycles = decorator_1.listModule(decorator_1.CONFIGURATION_KEY);
+        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
         for (const cycle of cycles) {
             let inst;
             if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
@@ -343,20 +308,11 @@ class BaseFramework {
                 inst = cycle.target;
             }
             else {
-                const providerId = decorator_1.getProviderId(cycle.target);
+                const providerId = (0, decorator_1.getProviderUUId)(cycle.target);
                 inst = await this.applicationContext.getAsync(providerId);
             }
             if (inst.onStop && typeof inst.onStop === 'function') {
-                await inst.onStop(new Proxy(this.getApplicationContext(), {
-                    get: function (target, prop, receiver) {
-                        if (prop === 'getCurrentNamespace' && cycle.namespace) {
-                            return () => {
-                                return cycle.namespace;
-                            };
-                        }
-                        return Reflect.get(target, prop, receiver);
-                    },
-                }), this.app);
+                await inst.onStop(this.getApplicationContext(), this.app);
             }
         }
     }
@@ -366,7 +322,7 @@ class BaseFramework {
      */
     async loadPreloadModule() {
         // some common decorator implementation
-        const modules = decorator_1.listPreloadModule();
+        const modules = (0, decorator_1.listPreloadModule)();
         for (const module of modules) {
             // preload init context
             await this.applicationContext.getAsync(module);
@@ -380,7 +336,7 @@ class BaseFramework {
         return this.logger;
     }
     createLogger(name, option = {}) {
-        return logger_2.createMidwayLogger(this, name, option);
+        return (0, logger_2.createMidwayLogger)(this, name, option);
     }
     getProjectName() {
         return this.applicationContext.getInformationService().getProjectName();

package/dist/common/reflectTool.d.ts

@@ -1,5 +1,7 @@
 import 'reflect-metadata';
-import { ReflectResult } from '@midwayjs/decorator';
+export interface ReflectResult {
+    [key: string]: any[];
+}
 /**
  * 以数组形式返回对象所有 property, 数组第一个元素是距离 o 最近的原型
  * @param target 对象，class 或者 function

package/dist/context/container.d.ts

@@ -1,19 +1,15 @@
+/// <reference types="node" />
 import { ObjectDefinitionOptions, ObjectIdentifier } from '@midwayjs/decorator';
-import { BaseApplicationContext } from './applicationContext';
-import { IConfigService, IEnvironmentService, IFileDetector, IInformationService, IMidwayContainer, IObjectDefinitionMetadata } from '../interface';
+import * as util from 'util';
+import { IConfigService, IEnvironmentService, IFileDetector, IIdentifierRelationShip, IInformationService, IMidwayContainer, IObjectDefinition, IObjectDefinitionRegistry } from '../interface';
 import { ResolverHandler } from './resolverHandler';
-declare class ContainerConfiguration {
-    readonly container: any;
-    private namespace;
-    constructor(container: any);
-    load(module: any): void;
-    addImports(imports?: any[]): void;
-    bindConfigurationClass(clzz: any, filePath?: string): void;
-    private getConfigurationExport;
-}
-export declare class MidwayContainer extends BaseApplicationContext implements IMidwayContainer {
+import { ManagedResolverFactory } from './managedResolverFactory';
+export declare class MidwayContainer implements IMidwayContainer {
+    private _resolverFactory;
+    private _registry;
+    private _identifierMapping;
+    parent: IMidwayContainer;
     private debugLogger;
-    private definitionMetadataList;
     protected resolverHandler: ResolverHandler;
     protected ctx: {};
     protected configService: IConfigService;
@@ -23,21 +19,22 @@ export declare class MidwayContainer extends BaseApplicationContext implements I
     private fileDetector;
     private attrMap;
     private isLoad;
-    init(): void;
-    initService(): void;
+    constructor(parent?: IMidwayContainer);
+    protected init(): void;
+    get registry(): IObjectDefinitionRegistry;
+    set registry(registry: IObjectDefinitionRegistry);
+    get managedResolverFactory(): ManagedResolverFactory;
+    get identifierMapping(): IIdentifierRelationShip;
+    protected initService(): void;
     load(module?: any): void;
-    createConfiguration(): ContainerConfiguration;
-    protected getIdentifier(target: any): string;
-    ready(): Promise<void>;
+    protected loadDefinitions(): void;
     bindClass(exports: any, namespace?: string, filePath?: string): void;
     bind<T>(target: T, options?: ObjectDefinitionOptions): void;
     bind<T>(identifier: ObjectIdentifier, target: T, options?: ObjectDefinitionOptions): void;
-    protected restoreDefinition(definitionMeta: IObjectDefinitionMetadata): void;
-    protected restoreDefinitions(definitionMetadataList: any): void;
-    protected getDefinitionMetaList(): any[];
-    protected bindModule(module: any, namespace?: string, filePath?: string): void;
-    getDebugLogger(): (msg: string, ...param: any[]) => void;
+    protected bindModule(module: any, options?: ObjectDefinitionOptions): void;
+    getDebugLogger(): util.DebugLogger;
     setFileDetector(fileDetector: IFileDetector): void;
+    createChild(): IMidwayContainer;
     registerDataHandler(handlerType: string, handler: (...args: any[]) => any): void;
     getConfigService(): IConfigService;
     getEnvironmentService(): IEnvironmentService;
@@ -48,6 +45,34 @@ export declare class MidwayContainer extends BaseApplicationContext implements I
     getResolverHandler(): ResolverHandler;
     setAttr(key: string, value: any): void;
     getAttr<T>(key: string): T;
+    protected getIdentifier(target: any): string;
+    protected findRegisterObject(identifier: any): any;
+    protected getManagedResolverFactory(): ManagedResolverFactory;
+    stop(): Promise<void>;
+    ready(): Promise<void>;
+    get<T>(identifier: {
+        new (...args: any[]): T;
+    }, args?: any): T;
+    get<T>(identifier: ObjectIdentifier, args?: any): T;
+    getAsync<T>(identifier: {
+        new (...args: any[]): T;
+    }, args?: any): Promise<T>;
+    getAsync<T>(identifier: ObjectIdentifier, args?: any): Promise<T>;
+    /**
+     * proxy registry.registerObject
+     * @param {ObjectIdentifier} identifier
+     * @param target
+     */
+    registerObject(identifier: ObjectIdentifier, target: any): void;
+    /**
+     * register handler after instance create
+     * @param fn
+     */
+    afterEachCreated(fn: (ins: any, context: IMidwayContainer, definition?: IObjectDefinition) => void): void;
+    /**
+     * register handler before instance create
+     * @param fn
+     */
+    beforeEachCreated(fn: (Clzz: any, constructorArgs: any[], context: IMidwayContainer) => void): void;
 }
-export {};
 //# sourceMappingURL=container.d.ts.map