@midwayjs/core 3.12.0-beta.1 → 3.12.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/baseFramework.js

@@ -197,6 +197,9 @@ class BaseFramework {
                 ctx.getAttr = (key) => {
                     return ctx.requestContext.getAttr(key);
                 };
+                ctx.getApp = () => {
+                    return this.getApplication();
+                };
                 return ctx;
             },
             addConfigObject: (obj) => {

package/dist/common/dataSourceManager.d.ts

@@ -1,33 +1,12 @@
-export interface CreateDataSourceInstanceOptions {
-    /**
-     * @default false
-     */
-    validateConnection?: boolean;
-    /**
-     * @default true
-     */
-    cacheInstance?: boolean | undefined;
-}
-interface DataSourceConfig extends CreateDataSourceInstanceOptions {
-    dataSource: {
-        entities?: Array<string | unknown>;
-        [key: string]: unknown;
-    };
-}
-export declare abstract class DataSourceManager<T> {
+import { ModuleLoadType, DataSourceManagerConfigOption } from '../interface';
+export declare abstract class DataSourceManager<T, ConnectionOpts extends Record<string, any> = Record<string, any>> {
     protected dataSource: Map<string, T>;
-    protected options: Partial<DataSourceConfig>;
+    protected options: DataSourceManagerConfigOption<ConnectionOpts>;
     protected modelMapping: WeakMap<object, any>;
     private innerDefaultDataSourceName;
-    protected initDataSource(dataSourceConfig: {
-        dataSource: {
-            entities?: Array<string | unknown>;
-            [key: string]: unknown;
-        };
-        cacheInstance?: boolean;
-        validateConnection?: boolean;
-    }, appDirOrOptions: {
-        appDir: string;
+    protected initDataSource(dataSourceConfig: DataSourceManagerConfigOption<ConnectionOpts>, baseDirOrOptions: {
+        baseDir: string;
+        entitiesConfigKey?: string;
     } | string): Promise<void>;
     /**
      * get a data source instance
@@ -45,7 +24,10 @@ export declare abstract class DataSourceManager<T> {
      * @param dataSourceName
      */
     isConnected(dataSourceName: string): Promise<boolean>;
-    createInstance(config: any, clientName: any, options?: CreateDataSourceInstanceOptions): Promise<T | void>;
+    createInstance(config: any, clientName: any, options?: {
+        validateConnection?: boolean;
+        cacheInstance?: boolean | undefined;
+    }): Promise<T | void>;
     /**
      * get data source name by model or repository
      * @param modelOrRepository
@@ -59,6 +41,5 @@ export declare abstract class DataSourceManager<T> {
     getDefaultDataSourceName(): string;
 }
 export declare function formatGlobString(globString: string): string[];
-export declare function globModels(globString: string, appDir: string): any[];
-export {};
+export declare function globModels(globString: string, appDir: string, loadMode?: ModuleLoadType): Promise<any[]>;
 //# sourceMappingURL=dataSourceManager.d.ts.map

package/dist/common/dataSourceManager.js

@@ -11,6 +11,7 @@ const path_1 = require("path");
 const types_1 = require("../util/types");
 const constants_1 = require("../constants");
 const util_1 = require("util");
+const util_2 = require("../util");
 const debug = (0, util_1.debuglog)('midway:debug');
 class DataSourceManager {
     constructor() {
@@ -18,25 +19,27 @@ class DataSourceManager {
         this.options = {};
         this.modelMapping = new WeakMap();
     }
-    async initDataSource(dataSourceConfig, appDirOrOptions) {
+    async initDataSource(dataSourceConfig, baseDirOrOptions) {
         this.options = dataSourceConfig;
         if (!this.options.dataSource) {
             throw new error_1.MidwayParameterError('[DataSourceManager] must set options.dataSource.');
         }
-        if (typeof appDirOrOptions === 'string') {
-            appDirOrOptions = {
-                appDir: appDirOrOptions,
+        if (typeof baseDirOrOptions === 'string') {
+            baseDirOrOptions = {
+                baseDir: baseDirOrOptions,
+                entitiesConfigKey: 'entities',
             };
         }
         for (const dataSourceName in dataSourceConfig.dataSource) {
             const dataSourceOptions = dataSourceConfig.dataSource[dataSourceName];
-            if (dataSourceOptions['entities']) {
+            const userEntities = dataSourceOptions[baseDirOrOptions.entitiesConfigKey];
+            if (userEntities) {
                 const entities = new Set();
                 // loop entities and glob files to model
-                for (const entity of dataSourceOptions['entities']) {
+                for (const entity of userEntities) {
                     if (typeof entity === 'string') {
                         // string will be glob file
-                        const models = globModels(entity, appDirOrOptions.appDir);
+                        const models = await globModels(entity, baseDirOrOptions.baseDir);
                         for (const model of models) {
                             entities.add(model);
                             this.modelMapping.set(model, dataSourceName);
@@ -48,8 +51,9 @@ class DataSourceManager {
                         this.modelMapping.set(entity, dataSourceName);
                     }
                 }
-                dataSourceOptions['entities'] = Array.from(entities);
-                debug(`[core]: DataManager load ${dataSourceOptions['entities'].length} models from ${dataSourceName}.`);
+                dataSourceOptions[baseDirOrOptions.entitiesConfigKey] =
+                    Array.from(entities);
+                debug(`[core]: DataManager load ${dataSourceOptions[baseDirOrOptions.entitiesConfigKey].length} models from ${dataSourceName}.`);
             }
             // create data source
             const opts = {
@@ -153,7 +157,7 @@ function formatGlobString(globString) {
     return pattern;
 }
 exports.formatGlobString = formatGlobString;
-function globModels(globString, appDir) {
+async function globModels(globString, appDir, loadMode) {
     const pattern = formatGlobString(globString);
     const models = [];
     // string will be glob file
@@ -162,7 +166,9 @@ function globModels(globString, appDir) {
         ignore: constants_1.IGNORE_PATTERN,
     });
     for (const file of files) {
-        const exports = require(file);
+        const exports = await (0, util_2.loadModule)(file, {
+            loadMode,
+        });
         if (types_1.Types.isClass(exports)) {
             models.push(exports);
         }

package/dist/common/fileDetector.js

@@ -6,6 +6,7 @@ const glob_1 = require("@midwayjs/glob");
 const error_1 = require("../error");
 const constants_1 = require("../constants");
 const decorator_1 = require("../decorator");
+const util_1 = require("../util");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -110,7 +111,9 @@ class CommonJSFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
-                const exports = await import(file);
+                const exports = await (0, util_1.loadModule)(file, {
+                    loadMode: 'esm',
+                });
                 // add module to set
                 container.bindClass(exports, {
                     namespace: this.options.namespace,

package/dist/constants.d.ts

@@ -41,10 +41,14 @@ export declare const FUNCTION_INJECT_KEY = "midway:function_inject_key";
 export declare const MIDWAY_LOGGER_WRITEABLE_DIR = "MIDWAY_LOGGER_WRITEABLE_DIR";
 export declare const REQUEST_CTX_KEY = "ctx";
 export declare const REQUEST_OBJ_CTX_KEY = "_req_ctx";
+export declare const CONTAINER_OBJ_SCOPE = "_obj_scope";
 export declare const HTTP_SERVER_KEY = "_midway_http_server";
 export declare const REQUEST_CTX_LOGGER_CACHE_KEY = "_midway_ctx_logger_cache";
 export declare const ASYNC_CONTEXT_KEY: unique symbol;
 export declare const ASYNC_CONTEXT_MANAGER_KEY = "MIDWAY_ASYNC_CONTEXT_MANAGER_KEY";
 export declare const DEFAULT_PATTERN: string[];
 export declare const IGNORE_PATTERN: string[];
+export declare const SINGLETON_CONTAINER_CTX: {
+    _MAIN_CTX_: boolean;
+};
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IGNORE_PATTERN = exports.DEFAULT_PATTERN = exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.FUNCTION_INJECT_KEY = exports.KEYS = void 0;
+exports.SINGLETON_CONTAINER_CTX = exports.IGNORE_PATTERN = exports.DEFAULT_PATTERN = exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.CONTAINER_OBJ_SCOPE = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.FUNCTION_INJECT_KEY = exports.KEYS = void 0;
 /**
  * 静态参数
  *
@@ -44,6 +44,7 @@ exports.FUNCTION_INJECT_KEY = 'midway:function_inject_key';
 exports.MIDWAY_LOGGER_WRITEABLE_DIR = 'MIDWAY_LOGGER_WRITEABLE_DIR';
 exports.REQUEST_CTX_KEY = 'ctx';
 exports.REQUEST_OBJ_CTX_KEY = '_req_ctx';
+exports.CONTAINER_OBJ_SCOPE = '_obj_scope';
 exports.HTTP_SERVER_KEY = '_midway_http_server';
 exports.REQUEST_CTX_LOGGER_CACHE_KEY = '_midway_ctx_logger_cache';
 exports.ASYNC_CONTEXT_KEY = Symbol('ASYNC_CONTEXT_KEY');
@@ -57,4 +58,5 @@ exports.DEFAULT_PATTERN = [
     '**/**.cjs',
 ];
 exports.IGNORE_PATTERN = ['**/**.d.ts', '**/**.d.mts', '**/**.d.cts'];
+exports.SINGLETON_CONTAINER_CTX = { _MAIN_CTX_: true };
 //# sourceMappingURL=constants.js.map

package/dist/context/container.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { IFileDetector, IIdentifierRelationShip, IMidwayContainer, IModuleStore, IObjectDefinition, IObjectDefinitionRegistry, ObjectContext, ObjectIdentifier } from '../interface';
+import { IFileDetector, IIdentifierRelationShip, IMidwayContainer, IModuleStore, IObjectDefinition, IObjectDefinitionRegistry, ObjectContext, ObjectIdentifier, ScopeEnum } from '../interface';
 import { ManagedResolverFactory } from './managedResolverFactory';
 import * as EventEmitter from 'events';
 export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
@@ -9,7 +9,9 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     private moduleMap;
     private _objectCreateEventTarget;
     parent: IMidwayContainer;
-    protected ctx: {};
+    protected ctx: {
+        _MAIN_CTX_: boolean;
+    };
     private fileDetector;
     private attrMap;
     private _namespaceSet;
@@ -79,5 +81,6 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     getNamespaceList(): string[];
     hasDefinition(identifier: ObjectIdentifier): boolean;
     hasObject(identifier: ObjectIdentifier): boolean;
+    getInstanceScope(instance: any): ScopeEnum | undefined;
 }
 //# sourceMappingURL=container.d.ts.map

package/dist/context/container.js

@@ -186,8 +186,8 @@ class MidwayContainer {
         this._identifierMapping = null;
         this.moduleMap = null;
         this.parent = null;
-        // 仅仅用于兼容requestContainer的ctx
-        this.ctx = {};
+        // 仅仅用于兼容 requestContainer 的 ctx
+        this.ctx = constants_1.SINGLETON_CONTAINER_CTX;
         this.attrMap = new Map();
         this._namespaceSet = null;
         this.parent = parent;
@@ -502,6 +502,12 @@ class MidwayContainer {
     hasObject(identifier) {
         return this.registry.hasObject(identifier);
     }
+    getInstanceScope(instance) {
+        if (instance[constants_1.CONTAINER_OBJ_SCOPE]) {
+            return instance[constants_1.CONTAINER_OBJ_SCOPE];
+        }
+        return undefined;
+    }
 }
 exports.MidwayContainer = MidwayContainer;
 //# sourceMappingURL=container.js.map

package/dist/context/managedResolverFactory.d.ts

@@ -1,4 +1,4 @@
-import { IManagedResolver, IObjectDefinition, IManagedResolverFactoryCreateOptions, IMidwayContainer, IManagedInstance, InjectModeEnum, ObjectIdentifier } from '../interface';
+import { IManagedInstance, IManagedResolver, IManagedResolverFactoryCreateOptions, IMidwayContainer, InjectModeEnum, IObjectDefinition, ObjectIdentifier } from '../interface';
 export declare class ManagedReference implements IManagedInstance {
     type: string;
     name: string;
@@ -50,5 +50,6 @@ export declare class ManagedResolverFactory {
     depthFirstSearch(identifier: string, definition: IObjectDefinition, depth?: string[]): boolean;
     private getObjectEventTarget;
     private checkSingletonInvokeRequest;
+    private setInstanceScope;
 }
 //# sourceMappingURL=managedResolverFactory.d.ts.map

package/dist/context/managedResolverFactory.js

@@ -163,12 +163,18 @@ class ManagedResolverFactory {
             context: this.context,
             definition,
         });
-        if (definition.isSingletonScope() && definition.id) {
-            this.singletonCache.set(definition.id, inst);
-        }
-        // for request scope
-        if (definition.isRequestScope() && definition.id) {
-            this.context.registerObject(definition.id, inst);
+        if (definition.id) {
+            if (definition.isSingletonScope()) {
+                this.singletonCache.set(definition.id, inst);
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Singleton);
+            }
+            else if (definition.isRequestScope()) {
+                this.context.registerObject(definition.id, inst);
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Request);
+            }
+            else {
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Prototype);
+            }
         }
         this.removeCreateStatus(definition, true);
         return inst;
@@ -217,6 +223,7 @@ class ManagedResolverFactory {
         if (definition.isRequestScope() &&
             definition.constructor.name === 'ObjectDefinition') {
             debug('id = %s inject ctx', definition.id);
+            // set related ctx
             Object.defineProperty(inst, constants_1.REQUEST_OBJ_CTX_KEY, {
                 value: this.context.get(constants_1.REQUEST_CTX_KEY),
                 writable: false,
@@ -253,14 +260,20 @@ class ManagedResolverFactory {
             context: this.context,
             definition,
         });
-        if (definition.isSingletonScope() && definition.id) {
-            debug(`id = ${definition.id}(${definition.name}) set to singleton cache`);
-            this.singletonCache.set(definition.id, inst);
-        }
-        // for request scope
-        if (definition.isRequestScope() && definition.id) {
-            debug(`id = ${definition.id}(${definition.name}) set to register object`);
-            this.context.registerObject(definition.id, inst);
+        if (definition.id) {
+            if (definition.isSingletonScope()) {
+                debug(`id = ${definition.id}(${definition.name}) set to singleton cache`);
+                this.singletonCache.set(definition.id, inst);
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Singleton);
+            }
+            else if (definition.isRequestScope()) {
+                debug(`id = ${definition.id}(${definition.name}) set to register object`);
+                this.context.registerObject(definition.id, inst);
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Request);
+            }
+            else {
+                this.setInstanceScope(inst, interface_1.ScopeEnum.Prototype);
+            }
         }
         this.removeCreateStatus(definition, true);
         return inst;
@@ -409,6 +422,20 @@ class ManagedResolverFactory {
         }
         return true;
     }
+    setInstanceScope(inst, scope) {
+        if (typeof inst === 'object') {
+            if (scope === interface_1.ScopeEnum.Request &&
+                inst[constants_1.REQUEST_OBJ_CTX_KEY] === constants_1.SINGLETON_CONTAINER_CTX) {
+                scope = interface_1.ScopeEnum.Singleton;
+            }
+            Object.defineProperty(inst, constants_1.CONTAINER_OBJ_SCOPE, {
+                value: scope,
+                writable: false,
+                enumerable: false,
+                configurable: false,
+            });
+        }
+    }
 }
 exports.ManagedResolverFactory = ManagedResolverFactory;
 //# sourceMappingURL=managedResolverFactory.js.map

package/dist/context/requestContainer.d.ts

@@ -7,6 +7,8 @@ export declare class MidwayRequestContainer extends MidwayContainer {
     get<T = any>(identifier: any, args?: any): T;
     getAsync<T = any>(identifier: any, args?: any): Promise<T>;
     ready(): Promise<void>;
-    getContext(): {};
+    getContext(): {
+        _MAIN_CTX_: boolean;
+    };
 }
 //# sourceMappingURL=requestContainer.d.ts.map

package/dist/decorator/faas/serverlessTrigger.js

@@ -23,7 +23,7 @@ function ServerlessTrigger(type, metadata = {}) {
             type,
             methodName: functionName,
             metadata,
-        }, target.constructor);
+        }, target);
     };
 }
 exports.ServerlessTrigger = ServerlessTrigger;

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export { MidwayDecoratorService } from './service/decoratorService';
 export { MidwayMockService } from './service/mockService';
 export { RouterInfo, DynamicRouterInfo, RouterPriority, RouterCollectorOptions, MidwayWebRouterService, } from './service/webRouterService';
 export { MidwayServerlessFunctionService, WebRouterCollector, } from './service/slsFunctionService';
-export { CreateDataSourceInstanceOptions, DataSourceManager, } from './common/dataSourceManager';
+export { DataSourceManager } from './common/dataSourceManager';
 export * from './service/pipelineService';
 export * from './common/loggerFactory';
 export * from './common/serviceFactory';
@@ -33,7 +33,7 @@ export { AsyncContextManager, ASYNC_ROOT_CONTEXT, AsyncContext, } from './common
 export * from './decorator';
 export * from './decorator/decoratorManager';
 export * from './decorator/constant';
-export { safelyGet, safeRequire, loadModule, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } from './util/';
+export { safelyGet, safeRequire, loadModule, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, isTypeScriptEnvironment, } from './util/';
 export { extend } from './util/extend';
 export * from './util/webRouterParam';
 export * from './util/contextUtil';

package/dist/index.js

@@ -14,7 +14,7 @@ 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.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.Utils = exports.sleep = exports.retryWith = exports.retryWithAsync = exports.extend = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = exports.ASYNC_ROOT_CONTEXT = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.Utils = exports.sleep = exports.retryWith = exports.retryWithAsync = exports.extend = exports.isTypeScriptEnvironment = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = exports.ASYNC_ROOT_CONTEXT = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -84,6 +84,7 @@ Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: tru
 Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
 Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
 Object.defineProperty(exports, "wrapAsync", { enumerable: true, get: function () { return util_1.wrapAsync; } });
+Object.defineProperty(exports, "isTypeScriptEnvironment", { enumerable: true, get: function () { return util_1.isTypeScriptEnvironment; } });
 var extend_1 = require("./util/extend");
 Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 __exportStar(require("./util/webRouterParam"), exports);

package/dist/interface.d.ts

@@ -368,15 +368,25 @@ export type ServiceFactoryConfigOption<OPTIONS> = {
     };
     defaultClientName?: string;
 };
-export type DataSourceManagerConfigOption<OPTIONS> = {
+export type CreateDataSourceInstanceOptions = {
+    /**
+     * @default false
+     */
+    validateConnection?: boolean;
+    /**
+     * @default true
+     */
+    cacheInstance?: boolean | undefined;
+};
+export type DataSourceManagerConfigOption<OPTIONS, ENTITY_CONFIG_KEY extends string = 'entities'> = {
     default?: PowerPartial<OPTIONS>;
     defaultDataSourceName?: string;
     dataSource?: {
         [key: string]: PowerPartial<{
-            entities: any[];
+            [keyName in ENTITY_CONFIG_KEY]: any[];
         } & OPTIONS>;
     };
-};
+} & CreateDataSourceInstanceOptions;
 type ConfigType<T> = T extends (...args: any[]) => any ? Writable<PowerPartial<ReturnType<T>>> : Writable<PowerPartial<T>>;
 /**
  * Get definition from config
@@ -593,6 +603,11 @@ export interface IMidwayContainer extends IObjectFactory, WithFn<IObjectLifeCycl
      * @param key
      */
     getAttr<T>(key: string): T;
+    /**
+     * Get instance IoC container scope
+     * @param instance
+     */
+    getInstanceScope(instance: any): ScopeEnum | undefined;
 }
 /**
  * @deprecated
@@ -619,8 +634,8 @@ export interface IInformationService {
 }
 export interface IEnvironmentService {
     getCurrentEnvironment(): string;
-    setCurrentEnvironment(environment: string): any;
     isDevelopmentEnvironment(): boolean;
+    getModuleLoadType(): ModuleLoadType;
 }
 export declare enum MidwayProcessTypeEnum {
     APPLICATION = "APPLICATION",
@@ -645,6 +660,10 @@ export interface Context {
      * @param key
      */
     getAttr<T>(key: string): T;
+    /**
+     * Get current related application instance.
+     */
+    getApp(): IMidwayApplication;
 }
 export type IMidwayContext<FrameworkContext = unknown> = Context & FrameworkContext;
 export type NextFunction = () => Promise<any>;
@@ -799,6 +818,7 @@ export interface IMidwayBaseApplication<CTX extends IMidwayContext> {
     getNamespace(): string;
 }
 export type IMidwayApplication<T extends IMidwayContext = IMidwayContext, FrameworkApplication = unknown> = IMidwayBaseApplication<T> & FrameworkApplication;
+export type ModuleLoadType = 'commonjs' | 'esm';
 export interface IMidwayBootstrapOptions {
     [customPropertyKey: string]: any;
     baseDir?: string;
@@ -810,6 +830,7 @@ export interface IMidwayBootstrapOptions {
      */
     configurationModule?: any | any[];
     imports?: any | any[];
+    moduleLoadType?: ModuleLoadType;
     moduleDetector?: IFileDetector | false;
     logger?: boolean | ILogger;
     /**

package/dist/service/environmentService.d.ts

@@ -1,8 +1,11 @@
-import { IEnvironmentService } from '../interface';
+import { IEnvironmentService, ModuleLoadType } from '../interface';
 export declare class MidwayEnvironmentService implements IEnvironmentService {
     protected environment: string;
+    protected moduleLoadType: ModuleLoadType;
     getCurrentEnvironment(): string;
     setCurrentEnvironment(environment: string): void;
     isDevelopmentEnvironment(): boolean;
+    setModuleLoadType(moduleLoadType: ModuleLoadType): void;
+    getModuleLoadType(): ModuleLoadType;
 }
 //# sourceMappingURL=environmentService.d.ts.map

package/dist/service/environmentService.js

@@ -11,6 +11,9 @@ const interface_1 = require("../interface");
 const util_1 = require("../util");
 const decorator_1 = require("../decorator");
 let MidwayEnvironmentService = class MidwayEnvironmentService {
+    constructor() {
+        this.moduleLoadType = 'commonjs';
+    }
     getCurrentEnvironment() {
         if (!this.environment) {
             this.environment = (0, util_1.getCurrentEnvironment)();
@@ -23,6 +26,12 @@ let MidwayEnvironmentService = class MidwayEnvironmentService {
     isDevelopmentEnvironment() {
         return (0, util_1.isDevelopmentEnvironment)(this.environment);
     }
+    setModuleLoadType(moduleLoadType) {
+        this.moduleLoadType = moduleLoadType;
+    }
+    getModuleLoadType() {
+        return this.moduleLoadType;
+    }
 };
 MidwayEnvironmentService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/service/informationService.js

@@ -14,13 +14,23 @@ const interface_1 = require("../interface");
 const util_1 = require("../util");
 const path_1 = require("path");
 const decorator_1 = require("../decorator");
+const fs_1 = require("fs");
 let MidwayInformationService = class MidwayInformationService {
     init() {
         if (this.baseDir) {
             if (!this.appDir) {
                 this.appDir = (0, path_1.dirname)(this.baseDir);
             }
-            this.pkg = (0, util_1.safeRequire)((0, path_1.join)(this.appDir, 'package.json')) || {};
+            const pkgPath = (0, path_1.join)(this.appDir, 'package.json');
+            if ((0, fs_1.existsSync)(pkgPath)) {
+                const content = (0, fs_1.readFileSync)(pkgPath, {
+                    encoding: 'utf-8',
+                });
+                this.pkg = JSON.parse(content);
+            }
+            else {
+                this.pkg = {};
+            }
         }
         else {
             this.pkg = {};

package/dist/setup.js

@@ -88,29 +88,28 @@ async function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
     debug('[core]: set default file detector');
+    if (!globalOptions.moduleLoadType) {
+        globalOptions.moduleLoadType = 'commonjs';
+    }
     // set module detector
     if (globalOptions.moduleDetector !== false) {
-        const pkgJSON = await (0, _1.loadModule)((0, path_1.join)(appDir, 'package.json'), {
-            safeLoad: true,
-            enableCache: false,
-        });
-        const loadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
-        debug('[core]: module load mode = %s', loadMode);
+        debug('[core]: set module load type = %s', globalOptions.moduleLoadType);
         // set default entry file
         if (!globalOptions.imports) {
             globalOptions.imports = [
-                await (0, _1.loadModule)((0, path_1.join)(baseDir, 'configuration'), {
-                    loadMode,
+                await (0, _1.loadModule)((0, path_1.join)(baseDir, `configuration${(0, _1.isTypeScriptEnvironment)() ? '.ts' : '.js'}`), {
+                    loadMode: globalOptions.moduleLoadType,
                     safeLoad: true,
                 }),
             ];
         }
         if (globalOptions.moduleDetector === undefined) {
-            if (loadMode === 'esm') {
+            if (globalOptions.moduleLoadType === 'esm') {
                 applicationContext.setFileDetector(new _1.ESModuleFileDetector({
                     loadDir: baseDir,
                     ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
                 }));
+                globalOptions.moduleLoadType = 'esm';
             }
             else {
                 applicationContext.setFileDetector(new _1.CommonJSFileDetector({
@@ -230,6 +229,9 @@ function prepareGlobalApplicationContextSync(globalOptions) {
         }
     }
     printStepDebugInfo('Init MidwayConfigService, MidwayAspectService and MidwayDecoratorService');
+    // init default environment
+    const environmentService = applicationContext.get(_1.MidwayEnvironmentService);
+    environmentService.setModuleLoadType(globalOptions.moduleLoadType);
     // init default config
     const configService = applicationContext.get(_1.MidwayConfigService);
     configService.add([

package/dist/util/httpclient.d.ts

@@ -3,10 +3,8 @@
 /// <reference types="node" />
 import http = require('http');
 import https = require('https');
-type MethodType = 'GET' | 'POST';
 type MimeType = 'text' | 'json' | undefined;
 interface IOptions extends https.RequestOptions {
-    method?: MethodType;
     headers?: any;
     contentType?: MimeType;
     dataType?: MimeType;

package/dist/util/httpclient.js

@@ -23,10 +23,10 @@ async function makeHttpRequest(url, options = {}) {
     const whatwgUrl = new URL(url);
     const client = whatwgUrl.protocol === 'https:' ? https : http;
     options.method = (options.method || 'GET').toUpperCase();
-    const { contentType, dataType, method, timeout = 5000, ...otherOptions } = options;
+    const { contentType, dataType, method, timeout = 5000, headers: customHeaders, ...otherOptions } = options;
     const headers = {
         Accept: mimeMap[dataType] || mimeMap.octet,
-        ...options.headers,
+        ...customHeaders,
     };
     let data;
     if (method === 'GET' && options.data) {

package/dist/util/index.d.ts

@@ -122,6 +122,7 @@ export declare function getParamNames(func: any): string[];
 export declare function generateRandomId(): string;
 export declare function merge(target: any, src: any): any;
 export declare function toAsyncFunction<T extends (...args: any[]) => any>(method: T): (...args: Parameters<T>) => Promise<ReturnType<T>>;
+export declare function isTypeScriptEnvironment(): boolean;
 export declare const Utils: {
     sleep: typeof sleep;
     getParamNames: typeof getParamNames;
@@ -132,5 +133,6 @@ export declare const Utils: {
     toAsyncFunction: typeof toAsyncFunction;
     safeStringify: typeof safeStringify;
     safeParse: typeof safeParse;
+    isTypeScriptEnvironment: typeof isTypeScriptEnvironment;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = exports.toAsyncFunction = exports.merge = exports.generateRandomId = exports.getParamNames = exports.sleep = exports.wrapAsync = exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.Utils = exports.isTypeScriptEnvironment = exports.toAsyncFunction = exports.merge = exports.generateRandomId = exports.getParamNames = exports.sleep = exports.wrapAsync = exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -74,7 +74,15 @@ const loadModule = async (p, options = {}) => {
                 return require(p);
             }
             else {
-                return await import(p);
+                // if json file, import need add options
+                if (p.endsWith('.json')) {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    return (await import(p, { assert: { type: 'json' } })).default;
+                }
+                else {
+                    return await import(p);
+                }
             }
         }
         else {
@@ -467,6 +475,15 @@ function toAsyncFunction(method) {
     }
 }
 exports.toAsyncFunction = toAsyncFunction;
+function isTypeScriptEnvironment() {
+    const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
+    if ('false' === TS_MODE_PROCESS_FLAG) {
+        return false;
+    }
+    // eslint-disable-next-line node/no-deprecated-api
+    return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
+}
+exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 exports.Utils = {
     sleep,
     getParamNames,
@@ -477,5 +494,6 @@ exports.Utils = {
     toAsyncFunction,
     safeStringify: flatted_1.safeStringify,
     safeParse: flatted_1.safeParse,
+    isTypeScriptEnvironment,
 };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.12.0-beta.1",
+  "version": "3.12.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "0e9a08cd078c4c4dedfa753a8c1025806cc0b0a2"
 }