@midwayjs/core 3.11.12-beta.3 → 3.11.15

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/common/fileDetector.d.ts

@@ -2,14 +2,11 @@ import { IFileDetector, IMidwayContainer } from '../interface';
 export declare abstract class AbstractFileDetector<T> implements IFileDetector {
     options: T;
     extraDetectorOptions: T;
-    constructor(options?: T);
-    abstract run(container: IMidwayContainer): void | Promise<void>;
+    constructor(options: any);
+    abstract run(container: IMidwayContainer): any;
     setExtraDetectorOptions(detectorOptions: T): void;
 }
-/**
- * CommonJS module loader
- */
-export declare class CommonJSFileDetector extends AbstractFileDetector<{
+export declare class DirectoryFileDetector extends AbstractFileDetector<{
     loadDir?: string | string[];
     pattern?: string | string[];
     ignore?: string | string[];
@@ -17,19 +14,12 @@ export declare class CommonJSFileDetector extends AbstractFileDetector<{
     conflictCheck?: boolean;
 }> {
     private duplicateModuleCheckSet;
-    run(container: any): Promise<void>;
-    getType(): 'commonjs' | 'module';
-}
-/**
- * ES module loader
- */
-export declare class ESModuleFileDetector extends CommonJSFileDetector {
-    getType(): 'commonjs' | 'module';
+    run(container: any): void;
 }
 export declare class CustomModuleDetector extends AbstractFileDetector<{
     modules?: any[];
     namespace?: string;
 }> {
-    run(container: any): Promise<void>;
+    run(container: any): void;
 }
 //# sourceMappingURL=fileDetector.d.ts.map

package/dist/common/fileDetector.js

@@ -1,19 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomModuleDetector = exports.ESModuleFileDetector = exports.CommonJSFileDetector = exports.AbstractFileDetector = void 0;
+exports.CustomModuleDetector = exports.DirectoryFileDetector = exports.AbstractFileDetector = void 0;
 const types_1 = require("../util/types");
 const glob_1 = require("@midwayjs/glob");
 const error_1 = require("../error");
 const constants_1 = require("../constants");
 const decorator_1 = require("../decorator");
-async function requireModule(modulePath, type) {
-    if (type === 'commonjs') {
-        return require(modulePath);
-    }
-    else {
-        return await import(modulePath);
-    }
-}
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -29,23 +21,23 @@ const DEFAULT_IGNORE_PATTERN = [
     '**/logs/**',
     '**/run/**',
     '**/public/**',
+    '**/app/view/**',
+    '**/app/views/**',
+    '**/app/extend/**',
     '**/node_modules/**',
     '**/**.test.ts',
     '**/**.test.js',
     '**/__test__/**',
 ].concat(constants_1.IGNORE_PATTERN);
-/**
- * CommonJS module loader
- */
-class CommonJSFileDetector extends AbstractFileDetector {
+class DirectoryFileDetector extends AbstractFileDetector {
     constructor() {
         super(...arguments);
         this.duplicateModuleCheckSet = new Map();
     }
-    async run(container) {
-        var _a;
-        this.options = this.options || {};
-        const loadDirs = [].concat((_a = this.options.loadDir) !== null && _a !== void 0 ? _a : container.get('baseDir'));
+    run(container) {
+        const loadDirs = []
+            .concat(this.options.loadDir || [])
+            .concat(this.extraDetectorOptions.loadDir || []);
         for (const dir of loadDirs) {
             const fileResults = (0, glob_1.run)(DEFAULT_GLOB_PATTERN.concat(this.options.pattern || []).concat(this.extraDetectorOptions.pattern || []), {
                 cwd: dir,
@@ -68,7 +60,7 @@ class CommonJSFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
-                const exports = await requireModule(file, this.getType());
+                const exports = require(file);
                 // add module to set
                 container.bindClass(exports, {
                     namespace: this.options.namespace,
@@ -81,22 +73,10 @@ class CommonJSFileDetector extends AbstractFileDetector {
         // check end
         this.duplicateModuleCheckSet.clear();
     }
-    getType() {
-        return 'commonjs';
-    }
-}
-exports.CommonJSFileDetector = CommonJSFileDetector;
-/**
- * ES module loader
- */
-class ESModuleFileDetector extends CommonJSFileDetector {
-    getType() {
-        return 'module';
-    }
 }
-exports.ESModuleFileDetector = ESModuleFileDetector;
+exports.DirectoryFileDetector = DirectoryFileDetector;
 class CustomModuleDetector extends AbstractFileDetector {
-    async run(container) {
+    run(container) {
         for (const module of this.options.modules) {
             container.bindClass(module, {
                 namespace: this.options.namespace,

package/dist/context/container.d.ts

@@ -13,6 +13,7 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     private fileDetector;
     private attrMap;
     private _namespaceSet;
+    private isLoad;
     constructor(parent?: IMidwayContainer);
     protected init(): void;
     get objectCreateEventTarget(): EventEmitter;
@@ -21,8 +22,8 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     get managedResolverFactory(): ManagedResolverFactory;
     get identifierMapping(): IIdentifierRelationShip;
     get namespaceSet(): Set<string>;
-    load(module: any): void;
-    protected loadDefinitions(): void | Promise<void>;
+    load(module?: any): void;
+    protected loadDefinitions(): void;
     bindClass(exports: any, options?: Partial<IObjectDefinition>): void;
     bind<T>(target: T, options?: Partial<IObjectDefinition>): void;
     bind<T>(identifier: ObjectIdentifier, target: T, options?: Partial<IObjectDefinition>): void;
@@ -34,7 +35,7 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     protected getIdentifier(target: any): string;
     protected getManagedResolverFactory(): ManagedResolverFactory;
     stop(): Promise<void>;
-    ready(): void | Promise<void>;
+    ready(): void;
     get<T>(identifier: {
         new (...args: any[]): T;
     }, args?: any[], objectContext?: ObjectContext): T;

package/dist/context/container.js

@@ -14,6 +14,7 @@ const environmentService_1 = require("../service/environmentService");
 const configService_1 = require("../service/configService");
 const EventEmitter = require("events");
 const error_1 = require("../error");
+const extend_1 = require("../util/extend");
 const types_1 = require("../util/types");
 const util_1 = require("../util");
 const debug = util.debuglog('midway:debug');
@@ -24,7 +25,7 @@ class ContainerConfiguration {
         this.container = container;
         this.loadedMap = new WeakMap();
         this.namespaceList = [];
-        this.configurationOptionsList = [];
+        this.detectorOptionsList = [];
     }
     load(module) {
         let namespace = decorator_1.MAIN_MODULE_KEY;
@@ -55,7 +56,10 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
-                this.configurationOptionsList.push(configurationOptions);
+                this.detectorOptionsList.push({
+                    conflictCheck: configurationOptions.conflictCheck,
+                    ...configurationOptions.detectorOptions,
+                });
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
@@ -175,8 +179,8 @@ class ContainerConfiguration {
     getNamespaceList() {
         return this.namespaceList;
     }
-    getConfigurationOptionsList() {
-        return this.configurationOptionsList;
+    getDetectorOptionsList() {
+        return this.detectorOptionsList;
     }
 }
 class MidwayContainer {
@@ -190,6 +194,7 @@ class MidwayContainer {
         this.ctx = {};
         this.attrMap = new Map();
         this._namespaceSet = null;
+        this.isLoad = false;
         this.parent = parent;
         this.init();
     }
@@ -232,37 +237,30 @@ class MidwayContainer {
         return this._namespaceSet;
     }
     load(module) {
-        var _a, _b, _c;
-        if (!Array.isArray(module)) {
-            module = [module];
-        }
-        // load configuration
-        const configuration = new ContainerConfiguration(this);
-        for (const mod of module) {
-            if (mod) {
-                configuration.load(mod);
+        var _a;
+        if (module) {
+            // load configuration
+            const configuration = new ContainerConfiguration(this);
+            configuration.load(module);
+            for (const ns of configuration.getNamespaceList()) {
+                this.namespaceSet.add(ns);
+                debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
-        }
-        for (const ns of configuration.getNamespaceList()) {
-            this.namespaceSet.add(ns);
-            debug(`[core]: load configuration in namespace="${ns}" complete`);
-        }
-        const configurationOptionsList = (_a = configuration.getConfigurationOptionsList()) !== null && _a !== void 0 ? _a : [];
-        // find user code configuration it's without namespace
-        const userCodeConfiguration = (_b = configurationOptionsList.find(options => !options.namespace)) !== null && _b !== void 0 ? _b : {};
-        this.fileDetector = (_c = userCodeConfiguration.detector) !== null && _c !== void 0 ? _c : this.fileDetector;
-        if (this.fileDetector) {
-            this.fileDetector.setExtraDetectorOptions({
-                conflictCheck: userCodeConfiguration.conflictCheck,
-                ...userCodeConfiguration.detectorOptions,
-            });
+            const detectorOptionsMerged = {};
+            for (const detectorOptions of configuration.getDetectorOptionsList()) {
+                (0, extend_1.extend)(true, detectorOptionsMerged, detectorOptions);
+            }
+            (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.setExtraDetectorOptions(detectorOptionsMerged);
+            this.isLoad = true;
         }
     }
     loadDefinitions() {
-        // load project file
-        if (this.fileDetector) {
-            return this.fileDetector.run(this);
+        var _a;
+        if (!this.isLoad) {
+            this.load();
         }
+        // load project file
+        (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.run(this);
     }
     bindClass(exports, options) {
         if (types_1.Types.isClass(exports) || types_1.Types.isFunction(exports)) {
@@ -413,7 +411,7 @@ class MidwayContainer {
         this.registry.clearAll();
     }
     ready() {
-        return this.loadDefinitions();
+        this.loadDefinitions();
     }
     get(identifier, args, objectContext) {
         var _a;

package/dist/context/requestContainer.d.ts

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

package/dist/context/requestContainer.js

@@ -67,7 +67,7 @@ class MidwayRequestContainer extends container_1.MidwayContainer {
             return this.parent.getAsync(identifier, args);
         }
     }
-    async ready() {
+    ready() {
         // ignore other things
     }
     getContext() {

package/dist/decorator/common/configuration.d.ts

@@ -1,4 +1,3 @@
-import { IFileDetector } from '../../interface';
 export interface IComponentInfo {
     component: any;
     enabledEnvironment?: string[];
@@ -18,7 +17,6 @@ export interface InjectionConfigurationOptions {
     }> | Record<string, any>;
     importConfigFilter?: (config: Record<string, any>) => Record<string, any>;
     namespace?: string;
-    detector?: IFileDetector | false;
     detectorOptions?: Record<string, any>;
     conflictCheck?: boolean;
 }

package/dist/index.d.ts

@@ -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, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } 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.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = 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");
@@ -74,7 +74,6 @@ __exportStar(require("./decorator/constant"), exports);
 var util_1 = require("./util/");
 Object.defineProperty(exports, "safelyGet", { enumerable: true, get: function () { return util_1.safelyGet; } });
 Object.defineProperty(exports, "safeRequire", { enumerable: true, get: function () { return util_1.safeRequire; } });
-Object.defineProperty(exports, "loadModule", { enumerable: true, get: function () { return util_1.loadModule; } });
 Object.defineProperty(exports, "delegateTargetPrototypeMethod", { enumerable: true, get: function () { return util_1.delegateTargetPrototypeMethod; } });
 Object.defineProperty(exports, "delegateTargetMethod", { enumerable: true, get: function () { return util_1.delegateTargetMethod; } });
 Object.defineProperty(exports, "delegateTargetProperties", { enumerable: true, get: function () { return util_1.delegateTargetProperties; } });

package/dist/interface.d.ts

@@ -569,10 +569,10 @@ export interface IMidwayContainer extends IObjectFactory, WithFn<IObjectLifeCycl
     parent: IMidwayContainer;
     identifierMapping: IIdentifierRelationShip;
     objectCreateEventTarget: EventEmitter;
-    ready(): void | Promise<void>;
+    ready(): any;
     stop(): Promise<void>;
     registerObject(identifier: ObjectIdentifier, target: any): any;
-    load(module: any | any[]): any;
+    load(module?: any): any;
     hasNamespace(namespace: string): boolean;
     getNamespaceList(): string[];
     hasDefinition(identifier: ObjectIdentifier): any;
@@ -599,7 +599,7 @@ export interface IMidwayContainer extends IObjectFactory, WithFn<IObjectLifeCycl
  */
 export type IApplicationContext = IMidwayContainer;
 export interface IFileDetector {
-    run(container: IMidwayContainer, fileDetectorOptions?: Record<string, any>): void | Promise<void>;
+    run(container: IMidwayContainer, fileDetectorOptions?: Record<string, any>): any;
     setExtraDetectorOptions(detectorOptions: Record<string, any>): any;
 }
 export interface IConfigService {
@@ -810,11 +810,8 @@ export interface IMidwayBootstrapOptions {
      */
     configurationModule?: any | any[];
     imports?: any | any[];
-    moduleDetector?: IFileDetector | false;
+    moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
-    /**
-     * @deprecated please set it from '@Configuration' decorator
-     */
     ignore?: string[];
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;

package/dist/service/slsFunctionService.js

@@ -203,7 +203,7 @@ class WebRouterCollector {
             if (this.baseDir) {
                 const container = new container_1.MidwayContainer();
                 (0, decorator_1.bindContainer)(container);
-                container.setFileDetector(new fileDetector_1.CommonJSFileDetector({
+                container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
                     loadDir: this.baseDir,
                 }));
                 await container.ready();

package/dist/setup.d.ts

@@ -5,14 +5,9 @@ import { MidwayContainer, IMidwayBootstrapOptions, IMidwayContainer } from './';
  */
 export declare function initializeGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer>;
 export declare function destroyGlobalApplicationContext(applicationContext: IMidwayContainer): Promise<void>;
-/**
- * prepare applicationContext
- * @param globalOptions
- */
-export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
 /**
  * prepare applicationContext, it use in egg framework.
  * @param globalOptions
  */
-export declare function prepareGlobalApplicationContextSync(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
+export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareGlobalApplicationContextSync = exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
+exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
 const _1 = require("./");
 const config_default_1 = require("./config/config.default");
 const decorator_1 = require("./decorator");
 const util = require("util");
-const slsFunctionService_1 = require("./service/slsFunctionService");
 const path_1 = require("path");
+const slsFunctionService_1 = require("./service/slsFunctionService");
 const debug = util.debuglog('midway:debug');
 let stepIdx = 1;
 function printStepDebugInfo(stepInfo) {
@@ -17,7 +17,7 @@ function printStepDebugInfo(stepInfo) {
  * @param globalOptions
  */
 async function initializeGlobalApplicationContext(globalOptions) {
-    const applicationContext = await prepareGlobalApplicationContext(globalOptions);
+    const applicationContext = prepareGlobalApplicationContext(globalOptions);
     printStepDebugInfo('Init logger');
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
@@ -67,120 +67,11 @@ async function destroyGlobalApplicationContext(applicationContext) {
     global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
 }
 exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
-/**
- * prepare applicationContext
- * @param globalOptions
- */
-async function prepareGlobalApplicationContext(globalOptions) {
-    var _a, _b, _c, _d, _e;
-    printStepDebugInfo('Ready to create applicationContext');
-    debug('[core]: start "initializeGlobalApplicationContext"');
-    debug(`[core]: bootstrap options = ${util.inspect(globalOptions)}`);
-    const appDir = (_a = globalOptions.appDir) !== null && _a !== void 0 ? _a : '';
-    const baseDir = (_b = globalOptions.baseDir) !== null && _b !== void 0 ? _b : '';
-    // new container
-    const applicationContext = (_c = globalOptions.applicationContext) !== null && _c !== void 0 ? _c : new _1.MidwayContainer();
-    // bind container to decoratorManager
-    debug('[core]: delegate module map from decoratorManager');
-    (0, decorator_1.bindContainer)(applicationContext);
-    global['MIDWAY_APPLICATION_CONTEXT'] = applicationContext;
-    // register baseDir and appDir
-    applicationContext.registerObject('baseDir', baseDir);
-    applicationContext.registerObject('appDir', appDir);
-    debug('[core]: set default file detector');
-    // 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);
-        // set default entry file
-        if (!globalOptions.imports) {
-            globalOptions.imports = [
-                await (0, _1.loadModule)((0, path_1.join)(baseDir, 'configuration'), {
-                    loadMode,
-                    safeLoad: true,
-                }),
-            ];
-        }
-        if (globalOptions.moduleDetector === undefined) {
-            if (loadMode === 'esm') {
-                applicationContext.setFileDetector(new _1.ESModuleFileDetector({
-                    loadDir: baseDir,
-                    ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
-                }));
-            }
-            else {
-                applicationContext.setFileDetector(new _1.CommonJSFileDetector({
-                    loadDir: baseDir,
-                    ignore: (_e = globalOptions.ignore) !== null && _e !== void 0 ? _e : [],
-                }));
-            }
-        }
-    }
-    printStepDebugInfo('Binding inner service');
-    // bind inner service
-    applicationContext.bindClass(_1.MidwayEnvironmentService);
-    applicationContext.bindClass(_1.MidwayInformationService);
-    applicationContext.bindClass(_1.MidwayAspectService);
-    applicationContext.bindClass(_1.MidwayDecoratorService);
-    applicationContext.bindClass(_1.MidwayConfigService);
-    applicationContext.bindClass(_1.MidwayLoggerService);
-    applicationContext.bindClass(_1.MidwayApplicationManager);
-    applicationContext.bindClass(_1.MidwayFrameworkService);
-    applicationContext.bindClass(_1.MidwayMiddlewareService);
-    applicationContext.bindClass(_1.MidwayLifeCycleService);
-    applicationContext.bindClass(_1.MidwayMockService);
-    applicationContext.bindClass(_1.MidwayWebRouterService);
-    applicationContext.bindClass(slsFunctionService_1.MidwayServerlessFunctionService);
-    printStepDebugInfo('Binding preload module');
-    // bind preload module
-    if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
-        for (const preloadModule of globalOptions.preloadModules) {
-            applicationContext.bindClass(preloadModule);
-        }
-    }
-    printStepDebugInfo('Init MidwayConfigService, MidwayAspectService and MidwayDecoratorService');
-    // init default config
-    const configService = applicationContext.get(_1.MidwayConfigService);
-    configService.add([
-        {
-            default: config_default_1.default,
-        },
-    ]);
-    // init aop support
-    applicationContext.get(_1.MidwayAspectService, [applicationContext]);
-    // init decorator service
-    applicationContext.get(_1.MidwayDecoratorService, [applicationContext]);
-    printStepDebugInfo('Load imports(component) and user code configuration module');
-    applicationContext.load([].concat(globalOptions.imports).concat(globalOptions.configurationModule));
-    printStepDebugInfo('Run applicationContext ready method');
-    // bind user code module
-    await applicationContext.ready();
-    if (globalOptions.globalConfig) {
-        if (Array.isArray(globalOptions.globalConfig)) {
-            configService.add(globalOptions.globalConfig);
-        }
-        else {
-            configService.addObject(globalOptions.globalConfig);
-        }
-    }
-    printStepDebugInfo('Load config file');
-    // merge config
-    configService.load();
-    debug('[core]: Current config = %j', configService.getConfiguration());
-    // middleware support
-    applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
-    return applicationContext;
-}
-exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
 /**
  * prepare applicationContext, it use in egg framework.
  * @param globalOptions
  */
-function prepareGlobalApplicationContextSync(globalOptions) {
+function prepareGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -198,8 +89,10 @@ function prepareGlobalApplicationContextSync(globalOptions) {
     applicationContext.registerObject('appDir', appDir);
     printStepDebugInfo('Ready module detector');
     if (globalOptions.moduleDetector !== false) {
-        if (globalOptions.moduleDetector === undefined) {
-            applicationContext.setFileDetector(new _1.CommonJSFileDetector({
+        if (globalOptions.moduleDetector === undefined ||
+            globalOptions.moduleDetector === 'file') {
+            applicationContext.setFileDetector(new _1.DirectoryFileDetector({
+                loadDir: baseDir,
                 ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
             }));
         }
@@ -247,7 +140,14 @@ function prepareGlobalApplicationContextSync(globalOptions) {
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
         ];
     }
-    applicationContext.load([].concat(globalOptions.imports).concat(globalOptions.configurationModule));
+    for (const configurationModule of []
+        .concat(globalOptions.imports)
+        .concat(globalOptions.configurationModule)) {
+        // load configuration and component
+        if (configurationModule) {
+            applicationContext.load(configurationModule);
+        }
+    }
     printStepDebugInfo('Run applicationContext ready method');
     // bind user code module
     applicationContext.ready();
@@ -267,5 +167,5 @@ function prepareGlobalApplicationContextSync(globalOptions) {
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
     return applicationContext;
 }
-exports.prepareGlobalApplicationContextSync = prepareGlobalApplicationContextSync;
+exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
 //# sourceMappingURL=setup.js.map

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

@@ -17,17 +17,6 @@ export declare const getCurrentEnvironment: () => string;
  * @since 2.0.0
  */
 export declare const safeRequire: (p: any, enabledCache?: boolean) => any;
-/**
- * load module, and it can be chosen commonjs or esm mode
- * @param p
- * @param options
- * @since 3.12.0
- */
-export declare const loadModule: (p: string, options?: {
-    enableCache?: boolean;
-    loadMode?: 'commonjs' | 'esm';
-    safeLoad?: boolean;
-}) => Promise<any>;
 /**
  *  @example
  *  safelyGet(['a','b'],{a: {b: 2}})  // => 2

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.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.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -54,47 +54,6 @@ const safeRequire = (p, enabledCache = true) => {
     }
 };
 exports.safeRequire = safeRequire;
-/**
- * load module, and it can be chosen commonjs or esm mode
- * @param p
- * @param options
- * @since 3.12.0
- */
-const loadModule = async (p, options = {}) => {
-    var _a, _b, _c;
-    options.enableCache = (_a = options.enableCache) !== null && _a !== void 0 ? _a : true;
-    options.safeLoad = (_b = options.safeLoad) !== null && _b !== void 0 ? _b : false;
-    options.loadMode = (_c = options.loadMode) !== null && _c !== void 0 ? _c : 'commonjs';
-    if (p.startsWith(`.${path_1.sep}`) || p.startsWith(`..${path_1.sep}`)) {
-        p = (0, path_1.resolve)((0, path_1.dirname)(module.parent.filename), p);
-    }
-    try {
-        if (options.enableCache) {
-            if (options.loadMode === 'commonjs') {
-                return require(p);
-            }
-            else {
-                return await import(p);
-            }
-        }
-        else {
-            const content = (0, fs_1.readFileSync)(p, {
-                encoding: 'utf-8',
-            });
-            return JSON.parse(content);
-        }
-    }
-    catch (err) {
-        if (!options.safeLoad) {
-            throw err;
-        }
-        else {
-            debug(`[core]: SafeLoadModule Warning\n\n${err.message}\n`);
-            return undefined;
-        }
-    }
-};
-exports.loadModule = loadModule;
 /**
  *  @example
  *  safelyGet(['a','b'],{a: {b: 2}})  // => 2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.11.12-beta.3",
+  "version": "3.11.15",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "koa": "2.14.1",
     "mm": "3.3.0",
     "raw-body": "2.5.2",
-    "sinon": "15.1.2"
+    "sinon": "15.2.0"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "a4054247f3b9f4fc8ba51684c002606d849e0bd3"
 }