@midwayjs/core 3.0.0-alpha.28 → 3.0.0-alpha.41

package/dist/baseFramework.js

@@ -107,11 +107,6 @@ class BaseFramework {
         await this.initializeLogger(options);
     }
     async containerDirectoryLoad(options) {
-        if (options.applicationContext) {
-            // 如果有传入全局容器，就不需要再次扫描了
-            return;
-        }
-        // 废弃 deprecated
         if (options.preloadModules && options.preloadModules.length) {
             for (const preloadModule of options.preloadModules) {
                 this.applicationContext.bindClass(preloadModule);
@@ -281,7 +276,7 @@ class BaseFramework {
             }
             else {
                 // 普通类写法
-                const providerId = (0, decorator_1.getProviderId)(cycle.target);
+                const providerId = (0, decorator_1.getProviderUUId)(cycle.target);
                 if (this.getApplicationContext().registry.hasDefinition(providerId)) {
                     cycle.instance =
                         await this.getApplicationContext().getAsync(providerId);
@@ -300,22 +295,7 @@ class BaseFramework {
         }
         for (const cycle of lifecycleInstanceList) {
             if (typeof cycle.instance.onReady === 'function') {
-                /**
-                 * 让组件能正确获取到 bind 之后 registerObject 的对象有三个方法
-                 * 1、在 load 之后修改 bind，不太可行
-                 * 2、每次 getAsync 的时候，去掉 namespace，同时还要查找当前全局的变量，性能差
-                 * 3、一般只会在 onReady 的地方执行 registerObject（否则没有全局的意义），这个取巧的办法就是 onReady 传入一个代理，其中绑定当前的 namespace
-                 */
-                await cycle.instance.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);
+                await cycle.instance.onReady(this.getApplicationContext(), this.app);
             }
         }
     }
@@ -328,20 +308,11 @@ class BaseFramework {
                 inst = cycle.target;
             }
             else {
-                const providerId = (0, 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);
             }
         }
     }

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,22 +1,15 @@
 /// <reference types="node" />
 import { ObjectDefinitionOptions, ObjectIdentifier } from '@midwayjs/decorator';
 import * as util from 'util';
-import { BaseApplicationContext } from './applicationContext';
-import { IConfigService, IEnvironmentService, IFileDetector, IInformationService, IMidwayContainer, IObjectDefinitionMetadata } from '../interface';
+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;
-    addImportConfigs(importConfigs: string[]): 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;
@@ -26,18 +19,19 @@ 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;
-    loadDefinitions(): void;
-    createConfiguration(): ContainerConfiguration;
+    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;
+    protected bindModule(module: any, options?: ObjectDefinitionOptions): void;
     getDebugLogger(): util.DebugLogger;
     setFileDetector(fileDetector: IFileDetector): void;
     createChild(): IMidwayContainer;
@@ -51,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