@midwayjs/core 3.11.12-beta.1 → 3.11.12-beta.2

package/dist/common/fileDetector.d.ts

@@ -2,7 +2,7 @@ import { IFileDetector, IMidwayContainer } from '../interface';
 export declare abstract class AbstractFileDetector<T> implements IFileDetector {
     options: T;
     extraDetectorOptions: T;
-    constructor(options: any);
+    constructor(options?: T);
     abstract run(container: IMidwayContainer): void | Promise<void>;
     setExtraDetectorOptions(detectorOptions: T): void;
 }

package/dist/common/fileDetector.js

@@ -6,15 +6,13 @@ 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) {
+async function requireModule(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)));
+    if (type === 'commonjs') {
+        return require(modulePath);
     }
     else {
-        return require(modulePath);
+        return await (_a = modulePath, Promise.resolve().then(() => require(_a)));
     }
 }
 class AbstractFileDetector {
@@ -32,9 +30,6 @@ const DEFAULT_IGNORE_PATTERN = [
     '**/logs/**',
     '**/run/**',
     '**/public/**',
-    '**/app/view/**',
-    '**/app/views/**',
-    '**/app/extend/**',
     '**/node_modules/**',
     '**/**.test.ts',
     '**/**.test.js',
@@ -50,6 +45,7 @@ class CommonJSFileDetector extends AbstractFileDetector {
     }
     async run(container) {
         var _a;
+        this.options = this.options || {};
         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 || []), {
@@ -73,7 +69,7 @@ class CommonJSFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
-                const exports = await loadModule(file, this.getType());
+                const exports = await requireModule(file, this.getType());
                 // add module to set
                 container.bindClass(exports, {
                     namespace: this.options.namespace,

package/dist/context/container.js

@@ -239,7 +239,9 @@ class MidwayContainer {
         // load configuration
         const configuration = new ContainerConfiguration(this);
         for (const mod of module) {
-            configuration.load(mod);
+            if (mod) {
+                configuration.load(mod);
+            }
         }
         for (const ns of configuration.getNamespaceList()) {
             this.namespaceSet.add(ns);

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, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } from './util/';
+export { safelyGet, safeRequire, loadModule, 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.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.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");
@@ -74,6 +74,7 @@ __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/setup.d.ts

@@ -5,9 +5,14 @@ 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 prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer | Promise<IMidwayContainer | MidwayContainer>;
+export declare function prepareGlobalApplicationContextSync(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
+exports.prepareGlobalApplicationContextSync = 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 path_1 = require("path");
 const slsFunctionService_1 = require("./service/slsFunctionService");
-const types_1 = require("./util/types");
+const path_1 = require("path");
 const debug = util.debuglog('midway:debug');
 let stepIdx = 1;
 function printStepDebugInfo(stepInfo) {
@@ -68,11 +67,120 @@ 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 prepareGlobalApplicationContext(globalOptions) {
+function prepareGlobalApplicationContextSync(globalOptions) {
     var _a, _b, _c, _d;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -141,31 +249,23 @@ function prepareGlobalApplicationContext(globalOptions) {
     }
     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;
-    }
     // bind user code module
-    const readyDefer = applicationContext.ready();
-    if ((0, types_1.isPromise)(readyDefer)) {
-        return readyDefer.then(afterLoad);
-    }
-    else {
-        return afterLoad();
+    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;
+exports.prepareGlobalApplicationContextSync = prepareGlobalApplicationContextSync;
 //# sourceMappingURL=setup.js.map

package/dist/util/index.d.ts

@@ -17,6 +17,17 @@ 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.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.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -54,6 +54,48 @@ 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;
+    var _b, _c, _d;
+    options.enableCache = (_b = options.enableCache) !== null && _b !== void 0 ? _b : true;
+    options.safeLoad = (_c = options.safeLoad) !== null && _c !== void 0 ? _c : false;
+    options.loadMode = (_d = options.loadMode) !== null && _d !== void 0 ? _d : '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 (_a = p, Promise.resolve().then(() => require(_a)));
+            }
+        }
+        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.1",
+  "version": "3.11.12-beta.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",