@midwayjs/core 3.11.6 → 3.11.12-beta.1

package/dist/common/dataListener.d.ts

@@ -1,7 +1,7 @@
 export declare abstract class DataListener<T> {
     private innerData;
     protected init(): Promise<void>;
-    abstract initData(): T;
+    abstract initData(): T | Promise<T>;
     abstract onData(callback: (data: T) => void): any;
     protected setData(data: T): void;
     getData(): T;

package/dist/common/fileDetector.d.ts

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

package/dist/common/fileDetector.js

@@ -1,11 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomModuleDetector = exports.DirectoryFileDetector = exports.AbstractFileDetector = void 0;
+exports.CustomModuleDetector = exports.ESModuleFileDetector = exports.CommonJSFileDetector = 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");
+const path_1 = require("path");
+async function loadModule(modulePath, type) {
+    var _a;
+    const ext = (0, path_1.extname)(modulePath);
+    if (ext === '.mjs' || type === 'module') {
+        return await (_a = modulePath, Promise.resolve().then(() => require(_a)));
+    }
+    else {
+        return require(modulePath);
+    }
+}
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -29,15 +40,17 @@ const DEFAULT_IGNORE_PATTERN = [
     '**/**.test.js',
     '**/__test__/**',
 ].concat(constants_1.IGNORE_PATTERN);
-class DirectoryFileDetector extends AbstractFileDetector {
+/**
+ * CommonJS module loader
+ */
+class CommonJSFileDetector extends AbstractFileDetector {
     constructor() {
         super(...arguments);
         this.duplicateModuleCheckSet = new Map();
     }
-    run(container) {
-        const loadDirs = []
-            .concat(this.options.loadDir || [])
-            .concat(this.extraDetectorOptions.loadDir || []);
+    async run(container) {
+        var _a;
+        const loadDirs = [].concat((_a = this.options.loadDir) !== null && _a !== void 0 ? _a : container.get('baseDir'));
         for (const dir of loadDirs) {
             const fileResults = (0, glob_1.run)(DEFAULT_GLOB_PATTERN.concat(this.options.pattern || []).concat(this.extraDetectorOptions.pattern || []), {
                 cwd: dir,
@@ -60,7 +73,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
-                const exports = require(file);
+                const exports = await loadModule(file, this.getType());
                 // add module to set
                 container.bindClass(exports, {
                     namespace: this.options.namespace,
@@ -73,10 +86,22 @@ class DirectoryFileDetector extends AbstractFileDetector {
         // check end
         this.duplicateModuleCheckSet.clear();
     }
+    getType() {
+        return 'commonjs';
+    }
+}
+exports.CommonJSFileDetector = CommonJSFileDetector;
+/**
+ * ES module loader
+ */
+class ESModuleFileDetector extends CommonJSFileDetector {
+    getType() {
+        return 'module';
+    }
 }
-exports.DirectoryFileDetector = DirectoryFileDetector;
+exports.ESModuleFileDetector = ESModuleFileDetector;
 class CustomModuleDetector extends AbstractFileDetector {
-    run(container) {
+    async run(container) {
         for (const module of this.options.modules) {
             container.bindClass(module, {
                 namespace: this.options.namespace,

package/dist/context/container.d.ts

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

package/dist/context/container.js

@@ -14,7 +14,6 @@ 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');
@@ -25,7 +24,7 @@ class ContainerConfiguration {
         this.container = container;
         this.loadedMap = new WeakMap();
         this.namespaceList = [];
-        this.detectorOptionsList = [];
+        this.configurationOptionsList = [];
     }
     load(module) {
         let namespace = decorator_1.MAIN_MODULE_KEY;
@@ -56,10 +55,7 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
-                this.detectorOptionsList.push({
-                    conflictCheck: configurationOptions.conflictCheck,
-                    ...configurationOptions.detectorOptions,
-                });
+                this.configurationOptionsList.push(configurationOptions);
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
@@ -179,8 +175,8 @@ class ContainerConfiguration {
     getNamespaceList() {
         return this.namespaceList;
     }
-    getDetectorOptionsList() {
-        return this.detectorOptionsList;
+    getConfigurationOptionsList() {
+        return this.configurationOptionsList;
     }
 }
 class MidwayContainer {
@@ -194,7 +190,6 @@ class MidwayContainer {
         this.ctx = {};
         this.attrMap = new Map();
         this._namespaceSet = null;
-        this.isLoad = false;
         this.parent = parent;
         this.init();
     }
@@ -237,30 +232,35 @@ class MidwayContainer {
         return this._namespaceSet;
     }
     load(module) {
-        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`);
-            }
-            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;
+        var _a, _b, _c;
+        if (!Array.isArray(module)) {
+            module = [module];
+        }
+        // load configuration
+        const configuration = new ContainerConfiguration(this);
+        for (const mod of module) {
+            configuration.load(mod);
+        }
+        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,
+            });
         }
     }
     loadDefinitions() {
-        var _a;
-        if (!this.isLoad) {
-            this.load();
-        }
         // load project file
-        (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.run(this);
+        if (this.fileDetector) {
+            return this.fileDetector.run(this);
+        }
     }
     bindClass(exports, options) {
         if (types_1.Types.isClass(exports) || types_1.Types.isFunction(exports)) {
@@ -411,7 +411,7 @@ class MidwayContainer {
         this.registry.clearAll();
     }
     ready() {
-        this.loadDefinitions();
+        return 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(): void;
+    ready(): Promise<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);
         }
     }
-    ready() {
+    async ready() {
         // ignore other things
     }
     getContext() {

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

@@ -1,3 +1,4 @@
+import { IFileDetector } from '../../interface';
 export interface IComponentInfo {
     component: any;
     enabledEnvironment?: string[];
@@ -17,6 +18,7 @@ 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/interface.d.ts

@@ -569,10 +569,10 @@ export interface IMidwayContainer extends IObjectFactory, WithFn<IObjectLifeCycl
     parent: IMidwayContainer;
     identifierMapping: IIdentifierRelationShip;
     objectCreateEventTarget: EventEmitter;
-    ready(): any;
+    ready(): void | Promise<void>;
     stop(): Promise<void>;
     registerObject(identifier: ObjectIdentifier, target: any): any;
-    load(module?: any): any;
+    load(module: any | 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>): any;
+    run(container: IMidwayContainer, fileDetectorOptions?: Record<string, any>): void | Promise<void>;
     setExtraDetectorOptions(detectorOptions: Record<string, any>): any;
 }
 export interface IConfigService {
@@ -810,8 +810,11 @@ export interface IMidwayBootstrapOptions {
      */
     configurationModule?: any | any[];
     imports?: any | any[];
-    moduleDetector?: 'file' | IFileDetector | false;
+    moduleDetector?: 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.DirectoryFileDetector({
+                container.setFileDetector(new fileDetector_1.CommonJSFileDetector({
                     loadDir: this.baseDir,
                 }));
                 await container.ready();

package/dist/setup.d.ts

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

package/dist/setup.js

@@ -7,6 +7,7 @@ const decorator_1 = require("./decorator");
 const util = require("util");
 const path_1 = require("path");
 const slsFunctionService_1 = require("./service/slsFunctionService");
+const types_1 = require("./util/types");
 const debug = util.debuglog('midway:debug');
 let stepIdx = 1;
 function printStepDebugInfo(stepInfo) {
@@ -17,7 +18,7 @@ function printStepDebugInfo(stepInfo) {
  * @param globalOptions
  */
 async function initializeGlobalApplicationContext(globalOptions) {
-    const applicationContext = prepareGlobalApplicationContext(globalOptions);
+    const applicationContext = await prepareGlobalApplicationContext(globalOptions);
     printStepDebugInfo('Init logger');
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
@@ -89,10 +90,8 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.registerObject('appDir', appDir);
     printStepDebugInfo('Ready module detector');
     if (globalOptions.moduleDetector !== false) {
-        if (globalOptions.moduleDetector === undefined ||
-            globalOptions.moduleDetector === 'file') {
-            applicationContext.setFileDetector(new _1.DirectoryFileDetector({
-                loadDir: baseDir,
+        if (globalOptions.moduleDetector === undefined) {
+            applicationContext.setFileDetector(new _1.CommonJSFileDetector({
                 ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
             }));
         }
@@ -140,32 +139,33 @@ function prepareGlobalApplicationContext(globalOptions) {
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
         ];
     }
-    for (const configurationModule of []
-        .concat(globalOptions.imports)
-        .concat(globalOptions.configurationModule)) {
-        // load configuration and component
-        if (configurationModule) {
-            applicationContext.load(configurationModule);
+    applicationContext.load([].concat(globalOptions.imports).concat(globalOptions.configurationModule));
+    printStepDebugInfo('Run applicationContext ready method');
+    function afterLoad() {
+        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;
     }
-    printStepDebugInfo('Run applicationContext ready method');
     // bind user code module
-    applicationContext.ready();
-    if (globalOptions.globalConfig) {
-        if (Array.isArray(globalOptions.globalConfig)) {
-            configService.add(globalOptions.globalConfig);
-        }
-        else {
-            configService.addObject(globalOptions.globalConfig);
-        }
+    const readyDefer = applicationContext.ready();
+    if ((0, types_1.isPromise)(readyDefer)) {
+        return readyDefer.then(afterLoad);
+    }
+    else {
+        return afterLoad();
     }
-    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;
 //# sourceMappingURL=setup.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.11.6",
+  "version": "3.11.12-beta.1",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,9 +23,9 @@
   "license": "MIT",
   "devDependencies": {
     "koa": "2.14.1",
-    "mm": "3.2.2",
+    "mm": "3.3.0",
     "raw-body": "2.5.2",
-    "sinon": "15.0.4"
+    "sinon": "15.1.2"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "d1ca8ca3ee5223c1c034ad3c97d335348931404b"
+  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-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.