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

package/dist/definitions/functionDefinition.js

@@ -28,9 +28,6 @@ class FunctionDefinition {
         this.innerScope = decorator_1.ScopeEnum.Singleton;
         this.creator = new FunctionWrapperCreator(this);
     }
-    set autowire(autowire) {
-        this.innerAutowire = autowire;
-    }
     getAttr(key) { }
     hasAttr(key) {
         return false;
@@ -44,9 +41,6 @@ class FunctionDefinition {
     isAsync() {
         return this.asynchronous;
     }
-    isAutowire() {
-        return this.innerAutowire;
-    }
     isDirect() {
         return false;
     }

package/dist/definitions/objectDefinition.d.ts

@@ -2,9 +2,8 @@ import { IObjectCreator, IObjectDefinition, HandlerProp } from '../interface';
 import { ScopeEnum, ObjectIdentifier } from '@midwayjs/decorator';
 import { ObjectProperties } from './properties';
 export declare class ObjectDefinition implements IObjectDefinition {
-    protected _attrs: Map<string, any>;
+    protected _attrs: Map<ObjectIdentifier, any>;
     protected _asynchronous: boolean;
-    protected _autowire: boolean;
     scope: ScopeEnum;
     creator: IObjectCreator;
     id: string;
@@ -21,8 +20,6 @@ export declare class ObjectDefinition implements IObjectDefinition {
     namespace: string;
     handlerProps: HandlerProp[];
     constructor();
-    set autowire(autowire: boolean);
-    isAutowire(): boolean;
     set asynchronous(asynchronous: boolean);
     isAsync(): boolean;
     isSingletonScope(): boolean;

package/dist/definitions/objectDefinition.js

@@ -9,8 +9,6 @@ class ObjectDefinition {
     constructor() {
         this._attrs = new Map();
         this._asynchronous = false;
-        // 对象定义默认需要自动装配
-        this._autowire = true;
         this.scope = decorator_1.ScopeEnum.Singleton;
         this.creator = null;
         this.id = null;
@@ -27,12 +25,6 @@ class ObjectDefinition {
         this.handlerProps = [];
         this.creator = new objectCreator_1.ObjectCreator(this);
     }
-    set autowire(autowire) {
-        this._autowire = autowire;
-    }
-    isAutowire() {
-        return this._autowire;
-    }
     set asynchronous(asynchronous) {
         this._asynchronous = asynchronous;
     }

package/dist/definitions/properties.d.ts

@@ -9,13 +9,11 @@ export declare class ObjectProperties implements IProperties {
     has(key: ObjectIdentifier): boolean;
     set(key: ObjectIdentifier, value: any): any;
     putAll(props: IProperties): void;
-    putObject(props: Record<string, unknown>, needClone?: boolean): void;
     stringPropertyNames(): ObjectIdentifier[];
     getProperty(key: ObjectIdentifier, defaultValue?: any): any;
     addProperty(key: ObjectIdentifier, value: any): void;
     setProperty(key: ObjectIdentifier, value: any): any;
     clear(): void;
     toJSON(): Record<string, unknown>;
-    clone(): IProperties;
 }
 //# sourceMappingURL=properties.d.ts.map

package/dist/definitions/properties.js

@@ -5,7 +5,7 @@ const _ = require("../common/lodashWrap");
 const util_1 = require("util");
 class ObjectProperties {
     constructor() {
-        this.innerConfig = {};
+        this.innerConfig = new Map();
     }
     get size() {
         return this.keys().length;
@@ -28,7 +28,7 @@ class ObjectProperties {
         return JSON.parse(JSON.stringify(_.get(this.innerConfig, key)));
     }
     has(key) {
-        return this.innerConfig[key] !== undefined;
+        return this.innerConfig.get(key) !== undefined;
     }
     set(key, value) {
         const origin = this.get(key);
@@ -38,25 +38,14 @@ class ObjectProperties {
     putAll(props) {
         const keys = props.keys();
         for (const key of keys) {
-            if (typeof this.innerConfig[key] === 'object') {
-                this.set(key, _.defaultsDeep(props.get(key), this.innerConfig[key]));
+            if (typeof this.innerConfig.get(key) === 'object') {
+                this.set(key, _.defaultsDeep(props.get(key), this.innerConfig.get(key)));
             }
             else {
                 this.set(key, props.get(key));
             }
         }
     }
-    putObject(props, needClone = false) {
-        if (needClone) {
-            const tmp = _.cloneDeep(props);
-            _.defaultsDeep(tmp, this.innerConfig);
-            this.innerConfig = tmp;
-        }
-        else {
-            _.defaultsDeep(props, this.innerConfig);
-            this.innerConfig = props;
-        }
-    }
     stringPropertyNames() {
         return this.keys();
     }
@@ -73,16 +62,11 @@ class ObjectProperties {
         return this.set(key, value);
     }
     clear() {
-        this.innerConfig = {};
+        this.innerConfig.clear();
     }
     toJSON() {
         return JSON.parse(JSON.stringify(this.innerConfig));
     }
-    clone() {
-        const cfg = new ObjectProperties();
-        cfg.putObject(this.toJSON());
-        return cfg;
-    }
 }
 exports.ObjectProperties = ObjectProperties;
 //# sourceMappingURL=properties.js.map

package/dist/features/pipeline.d.ts

@@ -127,7 +127,7 @@ export interface IPipelineHandler {
      */
     waterfall<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
 }
-import { IApplicationContext } from '../interface';
+import { IMidwayContainer } from '../interface';
 export declare class PipelineContext implements IPipelineContext {
     args: any;
     info: {
@@ -145,7 +145,7 @@ export declare class PipelineContext implements IPipelineContext {
 export declare class PipelineHandler implements IPipelineHandler {
     private applicationContext;
     private valves;
-    constructor(applicationContext: IApplicationContext, valves?: string[]);
+    constructor(applicationContext: IMidwayContainer, valves?: string[]);
     parallel<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
     concat<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
     series<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
@@ -155,5 +155,5 @@ export declare class PipelineHandler implements IPipelineHandler {
     private prepareParallelValves;
     private packResult;
 }
-export declare function pipelineFactory(applicationContext: IApplicationContext, valves?: string[]): PipelineHandler;
+export declare function pipelineFactory(applicationContext: IMidwayContainer, valves?: string[]): PipelineHandler;
 //# sourceMappingURL=pipeline.d.ts.map

package/dist/functional/configuration.d.ts

@@ -3,8 +3,10 @@ import { InjectionConfigurationOptions } from '@midwayjs/decorator';
 export declare class FunctionalConfiguration {
     private readyHandler;
     private stopHandler;
+    private configLoadHandler;
     private options;
     constructor(options: InjectionConfigurationOptions);
+    onConfigLoad(configLoadHandler: ((container: IMidwayContainer, app: IMidwayApplication) => any) | IMidwayContainer, app?: IMidwayApplication): this;
     onReady(readyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
     onStop(stopHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
     getConfigurationOptions(): InjectionConfigurationOptions;

package/dist/functional/configuration.js

@@ -6,6 +6,16 @@ class FunctionalConfiguration {
         this.options = options;
         this.readyHandler = () => { };
         this.stopHandler = () => { };
+        this.configLoadHandler = () => { };
+    }
+    onConfigLoad(configLoadHandler, app) {
+        if (typeof configLoadHandler === 'function') {
+            this.configLoadHandler = configLoadHandler;
+        }
+        else {
+            this.configLoadHandler(configLoadHandler, app);
+        }
+        return this;
     }
     onReady(readyHandler, app) {
         if (typeof readyHandler === 'function') {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { ObjectIdentifier, ObjectDefinitionOptions, IManagedInstance, ScopeEnum, MidwayFrameworkType, saveClassMetadata, attachClassMetadata, getClassMetadata, savePropertyDataToClass, attachPropertyDataToClass, getPropertyDataFromClass, listPropertyDataFromClass, savePropertyMetadata, attachPropertyMetadata, getPropertyMetadata, savePreloadModule, listPreloadModule, saveModule, listModule, resetModule, clearAllModule, getParamNames, getProviderId, getObjectDefinition, classNamed, generateProvideId, } from '@midwayjs/decorator';
+export { MidwayFrameworkType } from '@midwayjs/decorator';
 export * from './interface';
 export * from './context/container';
 export { MidwayRequestContainer } from './context/requestContainer';

package/dist/index.js

@@ -10,31 +10,9 @@ 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.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.generateProvideId = exports.classNamed = exports.getObjectDefinition = exports.getProviderId = exports.getParamNames = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getClassMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.MidwayFrameworkType = exports.ScopeEnum = void 0;
+exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.MidwayFrameworkType = void 0;
 var decorator_1 = require("@midwayjs/decorator");
-Object.defineProperty(exports, "ScopeEnum", { enumerable: true, get: function () { return decorator_1.ScopeEnum; } });
 Object.defineProperty(exports, "MidwayFrameworkType", { enumerable: true, get: function () { return decorator_1.MidwayFrameworkType; } });
-Object.defineProperty(exports, "saveClassMetadata", { enumerable: true, get: function () { return decorator_1.saveClassMetadata; } });
-Object.defineProperty(exports, "attachClassMetadata", { enumerable: true, get: function () { return decorator_1.attachClassMetadata; } });
-Object.defineProperty(exports, "getClassMetadata", { enumerable: true, get: function () { return decorator_1.getClassMetadata; } });
-Object.defineProperty(exports, "savePropertyDataToClass", { enumerable: true, get: function () { return decorator_1.savePropertyDataToClass; } });
-Object.defineProperty(exports, "attachPropertyDataToClass", { enumerable: true, get: function () { return decorator_1.attachPropertyDataToClass; } });
-Object.defineProperty(exports, "getPropertyDataFromClass", { enumerable: true, get: function () { return decorator_1.getPropertyDataFromClass; } });
-Object.defineProperty(exports, "listPropertyDataFromClass", { enumerable: true, get: function () { return decorator_1.listPropertyDataFromClass; } });
-Object.defineProperty(exports, "savePropertyMetadata", { enumerable: true, get: function () { return decorator_1.savePropertyMetadata; } });
-Object.defineProperty(exports, "attachPropertyMetadata", { enumerable: true, get: function () { return decorator_1.attachPropertyMetadata; } });
-Object.defineProperty(exports, "getPropertyMetadata", { enumerable: true, get: function () { return decorator_1.getPropertyMetadata; } });
-Object.defineProperty(exports, "savePreloadModule", { enumerable: true, get: function () { return decorator_1.savePreloadModule; } });
-Object.defineProperty(exports, "listPreloadModule", { enumerable: true, get: function () { return decorator_1.listPreloadModule; } });
-Object.defineProperty(exports, "saveModule", { enumerable: true, get: function () { return decorator_1.saveModule; } });
-Object.defineProperty(exports, "listModule", { enumerable: true, get: function () { return decorator_1.listModule; } });
-Object.defineProperty(exports, "resetModule", { enumerable: true, get: function () { return decorator_1.resetModule; } });
-Object.defineProperty(exports, "clearAllModule", { enumerable: true, get: function () { return decorator_1.clearAllModule; } });
-Object.defineProperty(exports, "getParamNames", { enumerable: true, get: function () { return decorator_1.getParamNames; } });
-Object.defineProperty(exports, "getProviderId", { enumerable: true, get: function () { return decorator_1.getProviderId; } });
-Object.defineProperty(exports, "getObjectDefinition", { enumerable: true, get: function () { return decorator_1.getObjectDefinition; } });
-Object.defineProperty(exports, "classNamed", { enumerable: true, get: function () { return decorator_1.classNamed; } });
-Object.defineProperty(exports, "generateProvideId", { enumerable: true, get: function () { return decorator_1.generateProvideId; } });
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");

package/dist/interface.d.ts

@@ -5,7 +5,7 @@ import { ILogger, LoggerOptions } from '@midwayjs/logger';
  * 生命周期定义
  */
 export interface ILifeCycle {
-    onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
+    onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<any>;
     onReady(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
     onStop?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
 }
@@ -22,7 +22,6 @@ export interface IMessageSource {
  */
 export interface IObjectFactory {
     registry: IObjectDefinitionRegistry;
-    isAsync(identifier: ObjectIdentifier): boolean;
     get<T>(identifier: new () => T, args?: any): T;
     get<T>(identifier: ObjectIdentifier, args?: any): T;
     getAsync<T>(identifier: new () => T, args?: any): Promise<T>;
@@ -45,7 +44,6 @@ export interface IObjectDefinition {
     dependsOn: ObjectIdentifier[];
     constructorArgs: IManagedInstance[];
     properties: IProperties;
-    isAutowire(): boolean;
     isAsync(): boolean;
     isSingletonScope(): boolean;
     isRequestScope(): boolean;
@@ -65,13 +63,12 @@ export interface HandlerProp {
  */
 export interface IObjectDefinitionMetadata {
     namespace?: string;
-    id: string;
+    id: ObjectIdentifier;
     name: string;
     initMethod: string;
     destroyMethod: string;
     constructMethod: string;
     scope: ScopeEnum;
-    autowire: boolean;
     srcPath: string;
     path: any;
     export: string;
@@ -88,13 +85,14 @@ export interface IObjectDefinitionMetadata {
 }
 export interface FrameworkDecoratorMetadata {
     key: string;
+    targetKey: string;
     propertyName: string;
     meta: any;
 }
 export interface IObjectCreator {
     load(): any;
-    doConstruct(Clzz: any, args?: any, context?: IApplicationContext): any;
-    doConstructAsync(Clzz: any, args?: any, context?: IApplicationContext): Promise<any>;
+    doConstruct(Clzz: any, args?: any, context?: IMidwayContainer): any;
+    doConstructAsync(Clzz: any, args?: any, context?: IMidwayContainer): Promise<any>;
     doInit(obj: any): void;
     doInitAsync(obj: any): Promise<void>;
     doDestroy(obj: any): void;
@@ -109,7 +107,6 @@ export interface IObjectDefinitionRegistry {
     registerDefinition(identifier: ObjectIdentifier, definition: IObjectDefinition): any;
     getSingletonDefinitionIds(): ObjectIdentifier[];
     getDefinition(identifier: ObjectIdentifier): IObjectDefinition;
-    getDefinitionByPath(path: string): IObjectDefinition;
     getDefinitionByName(name: string): IObjectDefinition[];
     removeDefinition(identifier: ObjectIdentifier): void;
     hasDefinition(identifier: ObjectIdentifier): boolean;
@@ -117,6 +114,8 @@ export interface IObjectDefinitionRegistry {
     hasObject(identifier: ObjectIdentifier): boolean;
     registerObject(identifier: ObjectIdentifier, target: any): any;
     getObject(identifier: ObjectIdentifier): any;
+    getIdentifierRelation(): IIdentifierRelationShip;
+    setIdentifierRelation(identifierRelation: IIdentifierRelationShip): any;
 }
 /**
  * 属性配置抽象
@@ -135,7 +134,6 @@ export interface IProperties {
     addProperty(key: ObjectIdentifier, value: any): void;
     setProperty(key: ObjectIdentifier, value: any): any;
     clear(): void;
-    clone(): IProperties;
 }
 /**
  * 资源配置抽象
@@ -156,19 +154,6 @@ export interface IResource {
     getSubResources(): IResource[];
     createRelative(path: string): IResource;
 }
-/**
- * IoC上下文抽象
- */
-export interface IApplicationContext extends IObjectFactory {
-    disableConflictCheck: boolean;
-    baseDir: string;
-    parent: IApplicationContext;
-    props: IProperties;
-    dependencyMap: Map<string, ObjectDependencyTree>;
-    ready(): any;
-    stop(): Promise<void>;
-    registerObject(identifier: ObjectIdentifier, target: any): any;
-}
 /**
  * 解析内部管理的属性、json、ref等实例的解析器
  * 同时创建这些对象的实际使用的对象
@@ -214,7 +199,18 @@ export interface IResolverHandler {
     hasHandler(key: string): boolean;
     getHandler(key: string): any;
 }
-export interface IMidwayContainer extends IApplicationContext {
+export interface IIdentifierRelationShip {
+    saveClassRelation(module: any, namespace?: string): any;
+    saveFunctionRelation(ObjectIdentifier: any, uuid: any): any;
+    hasRelation(id: ObjectIdentifier): boolean;
+    getRelation(id: ObjectIdentifier): string;
+}
+export interface IMidwayContainer extends IObjectFactory {
+    parent: IMidwayContainer;
+    identifierMapping: IIdentifierRelationShip;
+    ready(): any;
+    stop(): Promise<void>;
+    registerObject(identifier: ObjectIdentifier, target: any): any;
     load(module?: any): any;
     bind<T>(target: T, options?: ObjectDefinitionOptions): void;
     bind<T>(identifier: ObjectIdentifier, target: T, options?: ObjectDefinitionOptions): void;
@@ -223,9 +219,6 @@ export interface IMidwayContainer extends IApplicationContext {
     setFileDetector(fileDetector: IFileDetector): any;
     registerDataHandler(handlerType: string, handler: (...args: any[]) => any): any;
     createChild(): IMidwayContainer;
-    /**
-     * 默认不添加创建的 configuration 到 configurations 数组中
-     */
     getConfigService(): IConfigService;
     getEnvironmentService(): IEnvironmentService;
     getInformationService(): IInformationService;
@@ -246,7 +239,7 @@ export interface IMidwayContainer extends IApplicationContext {
     getAttr<T>(key: string): T;
 }
 export interface IFileDetector {
-    run(container: IApplicationContext): any;
+    run(container: IMidwayContainer): any;
 }
 export interface IConfigService {
     add(configFilePaths: any[]): any;
@@ -324,11 +317,6 @@ export interface IMidwayBaseApplication<T extends IMidwayContext = IMidwayContex
     getAttr<T>(key: string): T;
 }
 export declare type IMidwayApplication<T extends IMidwayContext = IMidwayContext, FrameworkApplication = unknown> = IMidwayBaseApplication<T> & FrameworkApplication;
-/**
- * @deprecated
- */
-export interface IMidwayCoreApplication extends IMidwayApplication {
-}
 export interface IMidwayBootstrapOptions {
     logger?: ILogger | boolean;
     baseDir?: string;
@@ -342,6 +330,7 @@ export interface IMidwayBootstrapOptions {
     loadDir?: string[];
     disableConflictCheck?: boolean;
     applicationContext?: IMidwayContainer;
+    configurationModule?: any;
     isMainFramework?: boolean;
     globalApplicationHandler?: (type: MidwayFrameworkType) => IMidwayApplication;
     globalConfig?: any;

package/dist/util/containerUtil.js

@@ -15,7 +15,7 @@ const createModuleContainer = (options) => {
 };
 exports.createModuleContainer = createModuleContainer;
 const createDirectoryGlobContainer = options => {
-    const applicationContext = new container_1.MidwayContainer(options.baseDir, undefined);
+    const applicationContext = new container_1.MidwayContainer();
     applicationContext.setFileDetector(new fileDetector_1.DirectoryFileDetector({
         loadDir: options.baseDir,
     }));

package/dist/util/webRouterCollector.d.ts

@@ -1,4 +1,8 @@
 export interface RouterInfo {
+    /**
+     * uuid
+     */
+    id: string;
     /**
      * router prefix
      */
@@ -92,6 +96,10 @@ export declare class WebRouterCollector {
         _paramString: string;
         _category: number;
         _weight: number;
+        /**
+         * uuid
+         */
+        id: string;
         /**
          * router prefix
          */